MonetDB: mutation - Silense compiler

[Martin Kersten]

Changeset: d642332e25a0 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d642332e25a0
Modified Files:
        monetdb5/optimizer/opt_multicore.c
        monetdb5/scheduler/Tests/All
        monetdb5/scheduler/mut_pack.c
Branch: mutation
Log Message:

Silense compiler


diffs (48 lines):

diff --git a/monetdb5/optimizer/opt_multicore.c 
b/monetdb5/optimizer/opt_multicore.c
--- a/monetdb5/optimizer/opt_multicore.c
+++ b/monetdb5/optimizer/opt_multicore.c
@@ -29,7 +29,7 @@
 int 
 OPTmulticoreImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr 
pci)
 {
-       int i,v;
+       int i,v, fnd =0;
        (void) cntxt;
        (void) pci;
        (void) stk;             /* to fool compilers */
@@ -44,11 +44,14 @@ OPTmulticoreImplementation(Client cntxt,
        pci->barrier = BARRIERsymbol;
        for ( i=0; i < mb->stop; i++){
                pci = getInstrPtr(mb,i);
-               if ( pci->token == ENDsymbol){
+               if ( pci->barrier == RETURNsymbol && fnd == 0)
+                       fnd ++;
+               if ( fnd == 1 || pci->token == ENDsymbol){
                        pci = newInstruction(mb,ASSIGNsymbol);
                        getArg(pci,0) = v;
                        pci->barrier = EXITsymbol;
                        insertInstruction(mb,pci,i);
+                       fnd++;
                        break;
                }
        }
diff --git a/monetdb5/scheduler/Tests/All b/monetdb5/scheduler/Tests/All
--- a/monetdb5/scheduler/Tests/All
+++ b/monetdb5/scheduler/Tests/All
@@ -2,4 +2,5 @@ sched00
 memo01
 memo02
 mutation00
+matpack00
 #query00
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
@@ -121,6 +121,7 @@ mutationPack(Client cntxt, Mutant m){
 
                if (qq == p && newpack && getArgPos(p, mvar) >=0 )
                {
+                       q= old[++i];
                        if ( getModuleId(q) == algebraRef)
                        {
                                if (getFunctionId(q) == joinRef || 
getFunctionId(q)== leftjoinRef || getFunctionId(q) == selectRef){
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list