MonetDB: SciQL-2 - Merge with Feb2013 branch

[Stefan Manegold]

Changeset: fa67373df5c9 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=fa67373df5c9
Modified Files:
        monetdb5/mal/mal_dataflow.c
        monetdb5/modules/mal/language.h
Branch: SciQL-2
Log Message:

Merge with Feb2013 branch


diffs (42 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
@@ -329,8 +329,6 @@ DFLOWworker(void *t)
                InstrPtr p = getInstrPtr(flow->mb, fe->pc);
                assert(p);
                fe->hotclaim = 0;
-               //for (i = 0; i < p->retc; i++)
-                       //fe->hotclaim += getMemoryClaim(flow->mb, flow->stk, 
p, i, FALSE);
                }
 #endif
                MT_lock_set(&flow->flowlock, "MALworker");
@@ -550,7 +548,6 @@ DFLOWscheduler(DataFlow flow, Queue *tod
        int last;
        int i;
 #ifdef USE_MAL_ADMISSION
-       //int j;
        InstrPtr p;
 #endif
        int tasks=0, actions;
@@ -574,8 +571,6 @@ DFLOWscheduler(DataFlow flow, Queue *tod
                                MT_lock_unset(&flow->flowlock, "MALworker");
                                throw(MAL, "dataflow", "DFLOWscheduler(): 
getInstrPtr(flow->mb,fe[i].pc) returned NULL");
                        }
-                       //for (j = p->retc; j < p->argc; j++)
-                               //fe[i].argclaim = 
getMemoryClaim(fe[0].flow->mb, fe[0].flow->stk, p, j, FALSE);
 #endif
                        q_enqueue(todo, flow->status + i);
                        flow->status[i].state = DFLOWrunning;
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,8 +55,8 @@ 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 CMDcallBAT(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);
 language_export str CMDdebug(int *ret, int *flg);
 language_export str MALassertTriple(Client cntxt, MalBlkPtr mb, MalStkPtr stk, 
InstrPtr p);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list