MonetDB: mutation - Handle the simple dataflow blocks

[Martin Kersten]

Changeset: a5f786622d75 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a5f786622d75
Modified Files:
        monetdb5/scheduler/mut_policy.c
        monetdb5/scheduler/run_mutation.c
Branch: mutation
Log Message:

Handle the simple dataflow blocks


diffs (62 lines):

diff --git a/monetdb5/scheduler/mut_policy.c b/monetdb5/scheduler/mut_policy.c
--- a/monetdb5/scheduler/mut_policy.c
+++ b/monetdb5/scheduler/mut_policy.c
@@ -48,7 +48,7 @@ str
 MUTpolicy(Client cntxt, Mutant m) 
 {
        MalBlkPtr src = m->src;
-       int i, target = 0, stop;
+       int i, target = 0, ssize;
        InstrPtr p;
 
        (void) cntxt;
@@ -81,7 +81,7 @@ MUTpolicy(Client cntxt, Mutant m)
        /* At this point we have a target instruction to be replaced */
        /* safe the previous version in the history list */
        if ( mutationCandidate(src,  p = getInstrPtr(src, m->target)) ){
-               stop = src->stop;
+               ssize = src->ssize;
 
                /* apply heuristics */
                if ( getModuleId(p) && strncmp(getModuleId(p), "algebra",7)== 0)
@@ -90,13 +90,13 @@ MUTpolicy(Client cntxt, Mutant m)
                        mutationSum(cntxt,m);
 
                /* reset/expand the profiler */
-               if ( stop < src->stop){
+               if (ssize < src->ssize){
                        GDKfree(src->profiler);
                        src->profiler = 0;
                        initProfiler(src);
+                       for( i = 0; i < src->stop; i++)
+                               src->profiler[i].ticks = 0;
                }
-               for( i = 0; i < src->stop; i++)
-                       src->profiler[i].ticks = 0;
 
                src->calls = 0;
                chkProgram(cntxt->fdout,cntxt->nspace,src);
diff --git a/monetdb5/scheduler/run_mutation.c 
b/monetdb5/scheduler/run_mutation.c
--- a/monetdb5/scheduler/run_mutation.c
+++ b/monetdb5/scheduler/run_mutation.c
@@ -60,10 +60,9 @@ RUNmutation(Client cntxt, MalBlkPtr mb, 
                mb->mutants = (void*) mutant;
 
                clk = GDKusec();
-               msg = runMALdataflow(cntxt, mb, getPC(mb,pci), pci->jump, stk);
+               msg = runMALdataflow(cntxt, mb, getPC(mb,pci), stk);
                mutant->calls++;
                mutant->runtime += GDKusec()- clk;
-               // turn on the scheduler call
                return msg;
        }
        
@@ -83,7 +82,7 @@ RUNmutation(Client cntxt, MalBlkPtr mb, 
                return msg;
        
        clk = GDKusec();
-       msg = runMALdataflow(cntxt, mutant->src, getPC(mb,pci), pci->jump, 
mutant->stk);
+       msg = runMALdataflow(cntxt, mutant->src, getPC(mb,pci), mutant->stk);
        mutant->runtime += GDKusec()- clk;
        
        *ret = 0;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list