Changeset: fcbbcb416c4f for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=fcbbcb416c4f
Modified Files:
        monetdb5/optimizer/opt_dataflow.c
Branch: default
Log Message:

Proper count of dataflow blocks


diffs (25 lines):

diff --git a/monetdb5/optimizer/opt_dataflow.c 
b/monetdb5/optimizer/opt_dataflow.c
--- a/monetdb5/optimizer/opt_dataflow.c
+++ b/monetdb5/optimizer/opt_dataflow.c
@@ -210,9 +210,10 @@ OPTdataflowImplementation(Client cntxt, 
                                                }
                                }
                                flowblock = newTmpVariable(mb,TYPE_bit);
-                               q= newFcnCall(mb,languageRef,dataflowRef);\
-                               q->barrier= BARRIERsymbol;\
-                               getArg(q,0)= flowblock;\
+                               q= newFcnCall(mb,languageRef,dataflowRef);
+                               q->barrier= BARRIERsymbol;
+                               getArg(q,0)= flowblock;
+                               actions++;
                        }
                        //copyblock 
                        for( j=start ; j<i; j++) 
@@ -230,7 +231,6 @@ OPTdataflowImplementation(Client cntxt, 
                        (void) memset((char*)assigned, 0, vlimit * sizeof 
(int));
                        (void) memset((char*) used, 0, vlimit * sizeof(int));
                        top = 0;
-                       actions++;
                        start = i+1;
                        if ( ! blockStart(p) && !conflict  ){
                                for ( k = 0; k < p->retc; k++)
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

Reply via email to