MonetDB: mutation - Ensure more parallel processing.

[Martin Kersten]

Changeset: 625cd29faeaa for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=625cd29faeaa
Modified Files:
        monetdb5/scheduler/Tests/query00.mal
        monetdb5/scheduler/mut_transforms.c
        monetdb5/scheduler/run_multicore.h
Branch: mutation
Log Message:

Ensure more parallel processing.


diffs (60 lines):

diff --git a/monetdb5/scheduler/Tests/query00.mal 
b/monetdb5/scheduler/Tests/query00.mal
--- a/monetdb5/scheduler/Tests/query00.mal
+++ b/monetdb5/scheduler/Tests/query00.mal
@@ -18,6 +18,7 @@ end initialize;
 function query(run:int, b:bat[:oid,:lng]);
        t0:= alarm.usec();
        profiler.activate("ticks");
+       profiler.activate("thread");
        profiler.activate("stmt");
        profiler.setAll();
        profiler.start();
@@ -35,7 +36,8 @@ exit z;
        profiler.stop();
        stmt:= profiler.getTrace("stmt");
        ticks:= profiler.getTrace("ticks");
-       io.print(ticks,stmt);
+       thread:= profiler.getTrace("thread");
+       io.print(thread,ticks,stmt);
 
 end query;
 
diff --git a/monetdb5/scheduler/mut_transforms.c 
b/monetdb5/scheduler/mut_transforms.c
--- a/monetdb5/scheduler/mut_transforms.c
+++ b/monetdb5/scheduler/mut_transforms.c
@@ -90,6 +90,11 @@ mutationJoin(Client cntxt, Mutant m){
                        // inherit profiling
                        m->src->profiler[m->src->stop-1].trace = profiler;
 
+                       q= newStmt(m->src, languageRef, passRef);
+                       q = pushArgument(m->src,q,getArg(p,1));
+                       // inherit profiling
+                       m->src->profiler[m->src->stop-1].trace = profiler;
+
                        q= copyInstruction(p);
                        getArg(q,2)= b1;
                        v1 = getArg(q,0)= newTmpVariable(m->src,TYPE_any);
@@ -204,6 +209,11 @@ mutationSelect(Client cntxt, Mutant m){
                        // inherit profiling
                        m->src->profiler[m->src->stop-1].trace = profiler;
 
+                       q= newStmt(m->src, languageRef, passRef);
+                       q = pushArgument(m->src,q,getArg(p,1));
+                       // inherit profiling
+                       m->src->profiler[m->src->stop-1].trace = profiler;
+
                        q= copyInstruction(p);
                        getArg(q,1)= b1;
                        v1 = getArg(q,0)= newTmpVariable(m->src,TYPE_any);
diff --git a/monetdb5/scheduler/run_multicore.h 
b/monetdb5/scheduler/run_multicore.h
--- a/monetdb5/scheduler/run_multicore.h
+++ b/monetdb5/scheduler/run_multicore.h
@@ -48,7 +48,7 @@ typedef struct MUTANT{
        int target;             // operation changed from previous
        struct MUTANT *next;
 } *Mutant;
-#define DEBUG_MULTICORE if(0)
+#define DEBUG_MULTICORE if(1)
 run_multicore_export str RUNmulticore(Client cntxt, MalBlkPtr mb, MalStkPtr 
stk, InstrPtr p);
 run_multicore_export void multicorePrint(Client cntxt, Mutant m);
 #endif /* MAL_RUN_MULTICORE */
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list