Changeset: c935ec8da74c for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c935ec8da74c
Modified Files:
monetdb5/mal/mal_dataflow.c
Branch: SciQL-2
Log Message:
Merge with Feb2013 branch.
diffs (28 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
@@ -385,15 +385,20 @@ DFLOWinitialize(int index)
return;
}
todo[index] = q_create(2048);
+ assert(todo[index]);
limit = GDKnr_threads ? GDKnr_threads : 1;
+ assert(limit <= THREADS);
for (worker = 0, i = 0; i < limit; i++){
for (; worker < THREADS; worker++)
if( workers[worker] == 0)
break;
- assert(workers[worker] == 0);
- MT_create_thread(&workers[worker], DFLOWworker, (void *)
&workers[worker], MT_THR_JOINABLE);
- assert(workers[worker] > 0);
- workerqueue[worker] = index + 1;
+ assert(worker < THREADS);
+ if (worker < THREADS) {
+ assert(workers[worker] == 0);
+ MT_create_thread(&workers[worker], DFLOWworker, (void
*) &workers[worker], MT_THR_JOINABLE);
+ assert(workers[worker] > 0);
+ workerqueue[worker] = index + 1;
+ }
}
MT_lock_unset(&mal_contextLock, "DFLOWinitialize");
}
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
