MonetDB: xid - Renaming of the operator.

[Martin Kersten]

Changeset: 5b605d95c7b2 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5b605d95c7b2
Modified Files:
        monetdb5/modules/mal/language.c
        monetdb5/modules/mal/language.h
        monetdb5/modules/mal/language.mal
Branch: xid
Log Message:

Renaming of the operator.


diffs (51 lines):

diff --git a/monetdb5/modules/mal/language.c b/monetdb5/modules/mal/language.c
--- a/monetdb5/modules/mal/language.c
+++ b/monetdb5/modules/mal/language.c
@@ -139,7 +139,7 @@ MALstartDataflow( Client cntxt, MalBlkPt
 }
 
 str
-MALsyncDataflow( Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
+MALwaitDataflow( Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
 {
        BAT *b;
        int *ret;
@@ -148,10 +148,10 @@ MALsyncDataflow( Client cntxt, MalBlkPtr
        (void) cntxt;
        (void) mb;
        if ( pci->retc * 2 != pci->argc )
-               throw(MAL,"language.sync","Input/output arguments unbalanced");
+               throw(MAL,"language.wait","Input/output arguments unbalanced");
        for ( i =0; i < pci->retc; i++){
                if ((b = BATdescriptor(*(int*) getArgReference(stk, pci, 
pci->retc + i))) == NULL)
-                       throw(MAL, "language.sync", RUNTIME_OBJECT_MISSING);
+                       throw(MAL, "language.wait", RUNTIME_OBJECT_MISSING);
                ret = (int*) getArgReference(stk,pci,i);
                BBPkeepref(*ret = b->batCacheid);
        }
diff --git a/monetdb5/modules/mal/language.h b/monetdb5/modules/mal/language.h
--- a/monetdb5/modules/mal/language.h
+++ b/monetdb5/modules/mal/language.h
@@ -47,7 +47,7 @@ language_export str MALassertSht(int *re
 language_export str MALassertInt(int *ret, int *val, str *msg);
 language_export str MALassertLng(int *ret, lng *val, str *msg);
 language_export str MALstartDataflow( Client cntxt, MalBlkPtr mb, MalStkPtr 
stk, InstrPtr pci);
-language_export str MALsyncDataflow( Client cntxt, MalBlkPtr mb, MalStkPtr 
stk, InstrPtr pci);
+language_export str MALwaitDataflow( Client cntxt, MalBlkPtr mb, MalStkPtr 
stk, InstrPtr pci);
 language_export str CMDregisterFunction(Client cntxt, MalBlkPtr mb, MalStkPtr 
stk, InstrPtr pci);
 language_export str CMDsetMemoryTrace(Client cntxt, MalBlkPtr mb, MalStkPtr 
stk, InstrPtr pci);
 language_export str CMDsetThreadTrace(Client cntxt, MalBlkPtr mb, MalStkPtr 
stk, InstrPtr pci);
diff --git a/monetdb5/modules/mal/language.mal 
b/monetdb5/modules/mal/language.mal
--- a/monetdb5/modules/mal/language.mal
+++ b/monetdb5/modules/mal/language.mal
@@ -34,8 +34,8 @@ pattern dataflow():bit
 address MALstartDataflow
 comment "The current guarded block is executed using dataflow control. ";
 
-pattern sync(b:bat[:any,:any]...) :bat[:any,:any]...
-address MALsyncDataflow
+pattern wait(b:bat[:any,:any]...) :bat[:any,:any]...
+address MALwaitDataflow
 comment "Introduce a dataflow synchronisation wait before continuing";
 
 pattern register(m:str,f:str,code:str,help:str):void
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list