MonetDB: default - Resource management before removing the queue.

[Martin Kersten]

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

Resource management before removing the queue.


diffs (22 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
@@ -342,16 +342,13 @@ DFLOWworker(void *t)
                        }
                MT_lock_unset(&flow->flowlock, "MALworker");
 
+               if ( fnxt == 0 && flow->cntxt->idx > 1 )
+                               MALresourceFairness(GDKusec()- 
flow->mb->starttime);
                q_enqueue(flow->done, fe);
                if ( fnxt == 0) {
                        assert(todo);
                        if (todo->last == 0)
                                profilerHeartbeatEvent("wait");
-                       /*
-                       else
-                       if ( flow->cntxt->idx > 1 )
-                                       MALresourceFairness(GDKusec()- 
flow->mb->starttime);
-                                       */
                }
        }
        GDKfree(GDKerrbuf);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list