MonetDB: default - Check proper instruction for admission hook

[mk]

Changeset: 9030e5f32c86 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9030e5f32c86
Modified Files:
        MonetDB5/src/mal/mal_interpreter.mx
Branch: default
Log Message:

Check proper instruction for admission hook
The admission should only be called once per instruction, not
for all arguments. And it only depends on the flow variable.


diffs (16 lines):

diff -r 0db23ac1d990 -r 9030e5f32c86 MonetDB5/src/mal/mal_interpreter.mx
--- a/MonetDB5/src/mal/mal_interpreter.mx       Mon Jul 05 12:31:17 2010 +0200
+++ b/MonetDB5/src/mal/mal_interpreter.mx       Mon Jul 05 16:06:37 2010 +0200
@@ -1349,10 +1349,9 @@
                for(i = limit-1; i >= pc ; i--)
                if (fs[i].status == DFLOWpending ) {
                        p = getInstrPtr(flow->mb, fs[i].pc);
+                       if(flow->stk->admit == 0 || 
(*flow->stk->admit)(flow->cntxt, flow->mb, flow->stk, p) )
                        for ( j= p->retc; j < p->argc; j++)
-                       if ( getArg(p,j)== oa && DFLOWeligible(flow,fs,i,p,pc) 
&&
-                               (f == 0 || f->flow->stk->admit == 0 || 
(*f->flow->stk->admit)(f->flow->cntxt, f->flow->mb, f->flow->stk, 
getInstrPtr(flow->mb, f->pc)) )
-                       ){
+                       if ( getArg(p,j)== oa && DFLOWeligible(flow,fs,i,p,pc)){
                                queued++;
                                candidates ++;
                                DFLOWactivate(flow,fs,i,p);
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list