MonetDB: mutation - typos

[Martin Kersten]

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

typos


diffs (75 lines):

diff --git a/monetdb5/scheduler/mut_pack.c b/monetdb5/scheduler/mut_pack.c
--- a/monetdb5/scheduler/mut_pack.c
+++ b/monetdb5/scheduler/mut_pack.c
@@ -73,8 +73,8 @@ mutationPack(Client cntxt, Mutant m){
 
        // first phase, see if we need to undo a bat.partition
        svar = -1; mvar = -1; dvar = -1;
-    for (i = 1; i < limit; i++) {
-        p= old[i];
+    for (i = 1; i < limit; i++) 
+       if ( (p= old[i])->token != NOOPsymbol){
                if (  i == pc){
                        if ( m->stk->stksize < mb->vtop + p->argc)
                                continue;
@@ -99,16 +99,13 @@ mutationPack(Client cntxt, Mutant m){
                        if (dvar == -1){
                                getArg(p, getArgPos(p,svar)) = mvar;
                                dvar = getArg(p,0);
-                       } else
-                               freeInstruction(p);
+                       } else 
+                               p->token = NOOPsymbol;
                } 
        }
 
-       DEBUG_MULTICORE {
+       DEBUG_MULTICORE 
                mnstr_printf(cntxt->fdout,"#mutationPack mvar %d svar %d dvar 
%d leftover %d\n", mvar,svar,dvar,limit);
-               for( i= 0; i< limit; i++)
-                       printInstruction(cntxt->fdout, mb, 0, old[i], 
LIST_MAL_ALL);
-       }
 
        // second phase, replace matpack with its successor
     for (i = 1; i < limit; i++) {
@@ -160,7 +157,7 @@ mutationPack(Client cntxt, Mutant m){
        }
        DEBUG_MULTICORE {
                mnstr_printf(cntxt->fdout,"#mutationPack mvar %d svar %d dvar 
%d leftover %d\n", mvar,svar,dvar,limit);
-               printFunction(cntxt->fdout, mb, 0, LIST_MAL_ALL);
+               //printFunction(cntxt->fdout, mb, 0, LIST_MAL_ALL);
        }
     GDKfree(old);
 }
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
@@ -92,7 +92,7 @@ MUTpolicyBaseline(Client cntxt, Mutant m
 
        // Find the most expensive instruction to replace
        m->target = 0;
-       target = MUTfindtarget(cntxt,m,MUT_THRESHOLD,0);
+       target = MUTfindtarget(cntxt,m,m->threshold,0);
        if ( target < 0)
                return 0;
 
diff --git a/monetdb5/scheduler/run_multicore.c 
b/monetdb5/scheduler/run_multicore.c
--- a/monetdb5/scheduler/run_multicore.c
+++ b/monetdb5/scheduler/run_multicore.c
@@ -51,12 +51,16 @@ RUNmulticore(Client cntxt, MalBlkPtr mb,
        } else
        if (MUTshouldrun(mb) ){
                // Keep old version in a mutant history 
+               mutant->threshold = MUT_THRESHOLD; 
                mutant->next = ((Mutant)mb->mutants);
                mutant->currentRun = mutant->next->currentRun + 1;
                ((Mutant) mb->mutants)->src = copyMalBlk(mb);
                mb->mutants = (void *) mutant;
 
                msg = MUTpolicy(cntxt,mutant);
+               // update the threshold
+               // clk = GDKusec() - clkInit;
+               // if ( mutant->threshold < clk) mutant->threshold= clk;
                if ( msg != MAL_SUCCEED) {
                        mb->mutants= ((Mutant)mb->mutants)->next; 
                        GDKfree(mutant);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list