Update of /cvsroot/monetdb/MonetDB5/src/scheduler
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv5567/scheduler
Modified Files:
mal_memorun.mx mal_scheduler.mx
Log Message:
Approvals of the changes due to major code patch.
Index: mal_scheduler.mx
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/scheduler/mal_scheduler.mx,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- mal_scheduler.mx 24 Dec 2007 12:28:25 -0000 1.21
+++ mal_scheduler.mx 2 Jan 2008 08:23:31 -0000 1.22
@@ -290,8 +290,8 @@
RUNinline(MalBlkPtr mb, MalStkPtr stk, InstrPtr p)
{
Symbol qc;
- str modnme = getConstant(mb, getArg(p, 1)).val.sval;
- str fcnnme = getConstant(mb, getArg(p, 2)).val.sval;
+ str modnme = getVarConstant(mb, getArg(p, 1)).val.sval;
+ str fcnnme = getVarConstant(mb, getArg(p, 2)).val.sval;
(void) stk;
(void) p;
Index: mal_memorun.mx
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/scheduler/mal_memorun.mx,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- mal_memorun.mx 16 Mar 2007 18:08:41 -0000 1.11
+++ mal_memorun.mx 2 Jan 2008 08:23:30 -0000 1.12
@@ -162,7 +162,7 @@
p->token = -p->token; /* temporary NOOP */
if( p->token<0)
for(i=0; i<p->retc; i++)
- setVarUsed(mb,getArg(p,i),-1);
+ setVarDisabled(mb,getArg(p,i));
}
}
@-
@@ -196,7 +196,7 @@
mincost= *(int*) getArgReference(stk,p,1);
for(i=3; i<p->argc; i+= 2){
cost= *(int*) getArgReference(stk,p,i);
- if( cost <mincost && isVarUsed(mb,getArg(p,i+1))> -1 ){
+ if( cost <mincost && !isVarDisabled(mb,getArg(p,i+1))){
mincost= cost;
target= getArg(p,i+1);
}
@@ -210,7 +210,7 @@
mincost= -1;
for(j=2;j<p->argc; j++){
- if( isVarUsed(mb,getArg(p,j))> -1 )
+ if( !isVarDisabled(mb,getArg(p,j)) )
for(i= pc+1; i<mb->stop; i++){
InstrPtr q= getInstrPtr(mb,i);
if(p->token >=0 && getArg(q,0)== getArg(p,j)){
@@ -230,8 +230,8 @@
/* remove non-qualifying variables */
for(i=2; i<p->argc; i+= 2)
if( getArg(p,i) != target){
- setVarUsed(mb,getArg(p,i-1),-1);
- setVarUsed(mb,getArg(p,i),-1);
+ setVarDisabled(mb,getArg(p,i-1));
+ setVarDisabled(mb,getArg(p,i));
}
propagateNonTarget(mb,pc+1);
#ifdef DEBUG_RUN_MEMORUN
@@ -253,7 +253,7 @@
lhs= &stk->stk[getArg(p,0)];
for(i=p->retc; i<p->argc; i++)
- if( isVarUsed(mb,getArg(p,i))> -1){
+ if( !isVarDisabled(mb,getArg(p,i))){
rhs= &stk->stk[getArg(p,i)];
if( (rhs)->vtype < TYPE_str)
*lhs = *rhs;
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Monetdb-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins
