Changeset: 0dea38cbc625 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0dea38cbc625
Modified Files:
MonetDB4/src/monet/monet_queue.mx
Branch: Oct2010
Log Message:
Make that the threadcnt(-1) command is not executed by the main thread.
This fixes the crash on Windows in tests/BugTracker test no.147.
The problem was, the request to stop a thread (putkillRequest()) might
be handled by the main thread which would then call MT_exit_thread()
which wasn't handled very elegantly (to say the least). We now avoid
this situation.
diffs (12 lines):
diff -r 3f670aed4a9d -r 0dea38cbc625 MonetDB4/src/monet/monet_queue.mx
--- a/MonetDB4/src/monet/monet_queue.mx Wed Nov 24 11:34:37 2010 +0100
+++ b/MonetDB4/src/monet/monet_queue.mx Wed Nov 24 11:39:46 2010 +0100
@@ -360,7 +360,7 @@
}
for (q = qm_first; q; q = q->ev_next)
if (q->ev_status == EVPENDING) {
- if (q->ev_process == 0 || q->ev_process == tid) {
+ if ((q->ev_process == 0 && (q->ev_data != 0 || tid !=
1)) || q->ev_process == tid) {
goto getReq0;
}
}
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
