Changeset: 8c2aa6872427 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8c2aa6872427
Modified Files:
monetdb5/mal/mal_dataflow.c
Branch: default
Log Message:
mal_dataflow.c: fixed (new) implementation of stopMALdataflow()
diffs (26 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
@@ -726,15 +726,14 @@ stopMALdataflow(void)
exiting = 1;
for (worker = 0; worker < THREADS; worker++) {
- int wq = workerqueue[worker];
- if (todo[wq]) {
+ int wq = workerqueue[worker] - 1;
+ if (wq >= 0 && todo[wq])
for (i = 0; i < THREADS; i++)
MT_sema_up(&todo[wq]->s, "stopMALdataflow");
- for (i = 0; i < THREADS; i++) {
- if (workers[i])
- MT_join_thread(workers[i]);
- workers[i] = 0;
- }
- }
+ }
+ for (i = 0; i < THREADS; i++) {
+ if (workers[i])
+ MT_join_thread(workers[i]);
+ workers[i] = 0;
}
}
_______________________________________________
checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
