Changeset: c9dbab140e8b for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c9dbab140e8b
Modified Files:
MonetDB5/src/mal/mal_interpreter.mx
Branch: Oct2010
Log Message:
DFLOWscheduler(): restore original order of DFLOWeligible() &
(*flow->stk->admit)()
as the latter (if present at all) might have side effects (with octopus)
diffs (12 lines):
diff -r ce92061abed8 -r c9dbab140e8b MonetDB5/src/mal/mal_interpreter.mx
--- a/MonetDB5/src/mal/mal_interpreter.mx Thu Oct 07 18:49:58 2010 +0200
+++ b/MonetDB5/src/mal/mal_interpreter.mx Thu Oct 07 19:12:23 2010 +0200
@@ -1393,7 +1393,7 @@
if (flow->stk->admit == 0) {
@:DFLOWscheduler_body( DFLOWeligible(flow,fs,i,p,pc) )@
} else {
- @:DFLOWscheduler_body( (*flow->stk->admit)(flow->cntxt,
flow->mb, flow->stk, p) && DFLOWeligible(flow,fs,i,p,pc) )@
+ @:DFLOWscheduler_body( DFLOWeligible(flow,fs,i,p,pc) &&
(*flow->stk->admit)(flow->cntxt, flow->mb, flow->stk, p) )@
}
@= DFLOWscheduler_body
/* first try to find all instructions that use the released
target */
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
