Changeset: 6f78ad03301a for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6f78ad03301a
Modified Files:
MonetDB5/src/mal/mal_interpreter.mx
Branch: Oct2010
Log Message:
DFLOWscheduler(): prevent potetial redundant calls of DFLOWeligible()
Only minor improvements for tests sql/src/test/rdf/Tests/q?_v.sql .
diffs (31 lines):
diff -r ede5bdd2d846 -r 6f78ad03301a MonetDB5/src/mal/mal_interpreter.mx
--- a/MonetDB5/src/mal/mal_interpreter.mx Thu Oct 07 14:56:04 2010 +0200
+++ b/MonetDB5/src/mal/mal_interpreter.mx Thu Oct 07 15:01:00 2010 +0200
@@ -1396,16 +1396,17 @@
if (fs[i].status == DFLOWpending ) {
p = getInstrPtr(flow->mb, fs[i].pc);
for ( j= p->retc; j < p->argc; j++)
- if ( getArg(p,j)== oa &&
- ( flow->stk->admit == 0 ||
(*flow->stk->admit)(flow->cntxt, flow->mb, flow->stk, p) ) )
- if ( DFLOWeligible(flow,fs,i,p,pc) ) {
- queued++;
- todo++;
- candidates = 1;
- DFLOWactivate(flow,fs,i,p);
- q_enqueue(flow->todo, fs+i);
- break;
- }
+ if ( getArg(p,j)== oa ) {
+ if ( flow->stk->admit == 0 ||
(*flow->stk->admit)(flow->cntxt, flow->mb, flow->stk, p) )
+ if (
DFLOWeligible(flow,fs,i,p,pc) ) {
+ queued++;
+ todo++;
+ candidates = 1;
+
DFLOWactivate(flow,fs,i,p);
+
q_enqueue(flow->todo, fs+i);
+ }
+ break;
+ }
}
/* if all work done then inspect rest */
if (candidates == 0)
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
