MonetDB: mutation - Use simple dataflow block designator

[Martin Kersten]

Changeset: 0bfacc0b5e34 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0bfacc0b5e34
Modified Files:
        monetdb5/scheduler/run_octopus.c
        monetdb5/scheduler/srvpool.c
Branch: mutation
Log Message:

Use simple dataflow block designator


diffs (70 lines):

diff --git a/monetdb5/scheduler/run_octopus.c b/monetdb5/scheduler/run_octopus.c
--- a/monetdb5/scheduler/run_octopus.c
+++ b/monetdb5/scheduler/run_octopus.c
@@ -388,7 +388,7 @@ str
 OCTOPUSdiscoverRegister(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr 
pci)
 {
        bit *res = (bit*) getArgReference(stk,pci,0);
-       int j, start, stop, k, found, v, pr;
+       int j, start, k, found, v, pr;
        InstrPtr p;
        str msg = MAL_SUCCEED;
        ValPtr wname;
@@ -434,11 +434,10 @@ OCTOPUSdiscoverRegister(Client cntxt, Ma
        }
 
        /* Register tentacle functions at peers */
-       stop = j;
        if ( !octopusLocal ){   /*skip registration for local execution*/
                stk->admit = &admitSerialConn;
                stk->wrapup = &wrapupSerialConn;
-               msg = runMALdataflow(cntxt,mb,start,stop,stk);
+               msg = runMALdataflow(cntxt,mb,start,stk);
                stk->admit = NULL;
                stk->wrapup = NULL;
        }
@@ -523,7 +522,7 @@ OCTOPUSbidding(Client cntxt, MalBlkPtr m
     else {     /* distributed execution */
                stk->admit = &admitSerialConn;
                stk->wrapup = &wrapupSerialConn;
-               msg = runMALdataflow(cntxt,mb,start,j,stk);
+               msg = runMALdataflow(cntxt,mb,start,stk);
                stk->admit = NULL;
                stk->wrapup = NULL;
        }
@@ -663,21 +662,15 @@ str
 OCTOPUSrun(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
 {
        bit *res = (bit*) getArgReference(stk,pci,0);
-       int j, start;
-       InstrPtr p;
+       int  start;
        str msg = MAL_SUCCEED;
 
        *res = 1;       /* execute the block */
        start = getPC(mb,pci);
-       for (j = start + 1; j< mb->stop ; j++){
-               p = getInstrPtr(mb,j);
-               if ( p->barrier == EXITsymbol )
-                       break;
-       }
 
        stk->admit = &admitSerialConn;
        stk->wrapup = &wrapupSerialConn;
-       msg = runMALdataflow(cntxt,mb,start,j,stk);
+       msg = runMALdataflow(cntxt,mb,start,stk);
        stk->admit = NULL;
        stk->wrapup = NULL;
 
diff --git a/monetdb5/scheduler/srvpool.c b/monetdb5/scheduler/srvpool.c
--- a/monetdb5/scheduler/srvpool.c
+++ b/monetdb5/scheduler/srvpool.c
@@ -448,7 +448,7 @@ SRVPOOLscheduler(Client cntxt, MalBlkPtr
                /* execute block in parallel */
                if ( getPC(mb, pci) > pci->jump)
                        throw(MAL,"scheduler.srvpool","Illegal statement 
range");
-               msg = runMALdataflow(cntxt, mb, getPC(mb,pci), pci->jump, stk);
+               msg = runMALdataflow(cntxt, mb, getPC(mb,pci), stk);
                *res = int_nil;  /* continue at end of block */
        }
        return msg;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list