MonetDB: Feb2013 - Enqueue done event after using flow record.

[Sjoerd Mullender]

Changeset: 0f30e64e9bb2 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0f30e64e9bb2
Modified Files:
        monetdb5/mal/mal_dataflow.c
Branch: Feb2013
Log Message:

Enqueue done event after using flow record.
The enqueue may cause runMALdataflow to continue and free flow.  Make
sure this happens *after* we're done with flow ourselves.


diffs (19 lines):

diff --git a/monetdb5/mal/mal_dataflow.c b/monetdb5/mal/mal_dataflow.c
--- a/monetdb5/mal/mal_dataflow.c
+++ b/monetdb5/mal/mal_dataflow.c
@@ -328,14 +328,13 @@ DFLOWworker(void *t)
                        }
                MT_lock_unset(&flow->flowlock, "MALworker");
 
-               q_enqueue(flow->done, fe);
                if ( fnxt == 0) {
                        if (todo->last == 0)
                                profilerHeartbeatEvent("wait");
                        else
                                MALresourceFairness(flow->cntxt, flow->mb, 
usec);
-                       
                }
+               q_enqueue(flow->done, fe);
        }
        GDKfree(GDKerrbuf);
        GDKsetbuf(0);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list