MonetDB: default - Adjusting octopus bidding block to the new si...

[Milena Ivanova]

Changeset: 33c0bd4148d9 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=33c0bd4148d9
Modified Files:
        monetdb5/scheduler/run_octopus.mx
Branch: default
Log Message:

Adjusting octopus bidding block to the new signature of the bidding functions 
(1 call per peer collecting bids for all tentacles).


diffs (35 lines):

diff --git a/monetdb5/scheduler/run_octopus.mx 
b/monetdb5/scheduler/run_octopus.mx
--- a/monetdb5/scheduler/run_octopus.mx
+++ b/monetdb5/scheduler/run_octopus.mx
@@ -531,10 +531,10 @@
 str
 OCTOPUSbidding(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
 {
-    bit *res = (bit*) getArgReference(stk,pci,0);
-    int j, start, k;
-    InstrPtr p;
-       lng *lbid;
+       bit *res = (bit*) getArgReference(stk,pci,0);
+       int j, start, k, i;
+       InstrPtr p;
+       lng bid;
        str *wname;
        str msg = MAL_SUCCEED;
 
@@ -550,11 +550,12 @@
        if ( octopusLocal ) { /* skip bidding for local execution */
                for (k = start + 1; k < j ; k++){
                p = getInstrPtr(mb,k);
-                       lbid = (lng*) getArgReference(stk,p,0);
-                       wname = (str*) getArgReference(stk,p,1);
+                       wname = (str*) getArgReference(stk,p,p->retc);
                        if ( strcmp(*wname, "NOTworker") == 0 )
-                       *lbid = -1;
-                       else *lbid = 0;
+                       bid = -1;
+                       else bid = 0;
+                       for ( i = 0; i < p->retc; i++) 
+                               *(lng*)getArgReference(stk,p,i) = bid;
                }
        }
     else {     /* distributed execution */
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list