Changeset: 98ac58eef94c for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=98ac58eef94c
Modified Files:
monetdb5/mal/mal_dataflow.c
monetdb5/mal/mal_dataflow.h
monetdb5/modules/mal/language.c
monetdb5/modules/mal/language.h
Branch: Feb2013
Log Message:
revert unintened(?) changes that "slipped in" with changeset 489815265a61
these appear unrelated to fixing bug 3346,
and rather the result of too coarse copy-&-paste
diffs (149 lines):
diff --git a/monetdb5/mal/mal_dataflow.c b/monetdb5/mal/mal_dataflow.c
--- a/monetdb5/mal/mal_dataflow.c
+++ b/monetdb5/mal/mal_dataflow.c
@@ -724,9 +724,3 @@ runMALdataflow(Client cntxt, MalBlkPtr m
GDKfree(flow);
return msg;
}
-
-void
-stopMALdataflow(void)
-{
- exiting = 1;
-}
diff --git a/monetdb5/mal/mal_dataflow.h b/monetdb5/mal/mal_dataflow.h
--- a/monetdb5/mal/mal_dataflow.h
+++ b/monetdb5/mal/mal_dataflow.h
@@ -25,7 +25,5 @@
#include "mal_resource.h"
mal_export str runMALdataflow(Client cntxt, MalBlkPtr mb, int startpc, int
stoppc, MalStkPtr stk);
-mal_export void stopMALdataflow(void);
-
#endif /* _MAL_DATAFLOW_H*/
diff --git a/monetdb5/modules/mal/language.c b/monetdb5/modules/mal/language.c
--- a/monetdb5/modules/mal/language.c
+++ b/monetdb5/modules/mal/language.c
@@ -121,22 +121,6 @@ CMDcallString(Client cntxt, MalBlkPtr mb
}
str
-CMDcallFunction(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
-{
- str mod = *(str*) getArgReference(stk,pci,1);
- str fcn = *(str*) getArgReference(stk,pci,2);
- char buf[BUFSIZ];
-
- (void) mb; /* fool compiler */
- if (strlen(mod) == 0 || strlen(fcn) ==0)
- return MAL_SUCCEED;
- // lazy implementation of the call
- snprintf(buf,BUFSIZ,"%s.%s();",mod,fcn);
- callString(cntxt, buf, FALSE);
- return MAL_SUCCEED;
-}
-
-str
MALstartDataflow( Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
{
int *ret = (int*) getArgReference(stk,pci,0);
@@ -255,3 +239,87 @@ CMDdebug(int *ret, int *flg)
GDKdebug = *flg;
return MAL_SUCCEED;
}
+
+/*
+ * MAL iterator code
+ * This module contains the framework for the construction of iterators.
+ * Iterators enumerate elements in a collection defined by a few parameters,
+ * e.g. a lower/upper bound.
+ *
+ * Iterators appear as ordinary function calls in the MAL code and
+ * always return a boolean, to indicate that an element is available for
+ * consumption. Initialization of the iterator representation depends
+ * on its kind.
+ *
+ * The most common class of iterators encountered in a programming
+ * environment is the for-loop. It contains a for-loop variable,
+ * a starting point and a limit. Changing the for-loop variable
+ * within the for-loop body is considered bad code and should be avoided
+ * to simplify data-flow analysis.
+ *
+ * We assume that the range boundaries comply with the underlying domain.
+ */
+str
+CMDsetMemoryTrace(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
+{
+ bit *flag= (bit*) getArgReference(stk,pci,1);
+
+ (void) mb;
+ if( *flag) {
+ cntxt->flags |= footprintFlag;
+ MCdefault |= footprintFlag;
+ } else {
+ cntxt->flags &= footprintFlag;
+ MCdefault &= ~footprintFlag;
+ }
+ return MAL_SUCCEED;
+}
+
+str
+CMDsetTimerTrace(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
+{
+ bit *flag= (bit*) getArgReference(stk,pci,1);
+
+ (void) mb;
+ if( *flag) {
+ cntxt->flags |= timerFlag;
+ MCdefault |= timerFlag;
+ } else {
+ cntxt->flags &= ~timerFlag;
+ MCdefault &= ~timerFlag;
+ }
+ return MAL_SUCCEED;
+}
+
+str
+CMDsetThreadTrace(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
+{
+ bit *flag= (bit*) getArgReference(stk,pci,1);
+
+ (void) mb;
+ if( *flag){
+ cntxt->flags |= threadFlag;
+ MCdefault |= threadFlag;
+ }else{
+ cntxt->flags &= threadFlag;
+ MCdefault &= ~threadFlag;
+ }
+ return MAL_SUCCEED;
+}
+
+
+str
+CMDsetIOTrace(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
+{
+ bit *flag= (bit*) getArgReference(stk,pci,1);
+
+ (void) mb;
+ if( *flag){
+ cntxt->flags |= ioFlag;
+ MCdefault |= ioFlag;
+ }else{
+ cntxt->flags &= ioFlag;
+ MCdefault &= ~ioFlag;
+ }
+ return MAL_SUCCEED;
+}
diff --git a/monetdb5/modules/mal/language.h b/monetdb5/modules/mal/language.h
--- a/monetdb5/modules/mal/language.h
+++ b/monetdb5/modules/mal/language.h
@@ -55,7 +55,6 @@ language_export str CMDsetThreadTrace(Cl
language_export str CMDsetIOTrace(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr pci);
language_export str CMDsetTimerTrace(Client cntxt, MalBlkPtr mb, MalStkPtr
stk, InstrPtr pci);
language_export str CMDcallString(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr pci);
-language_export str CMDcallFunction(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr pci);
language_export str CMDevalFile(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr pci);
language_export str CMDcallBAT(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr pci);
language_export str CMDincludeFile(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr pci);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
