X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2FCapability.c;h=99c68fd3b8ea447a5f52732b7d8ff51406282c73;hb=9cbee1b3381d4eac1f54e9f0b4c333e6ead3a4cf;hp=e384e1edddcb602a4a3c14b8fcb49cd36bf21dc2;hpb=88b35c172f9434fd98b700f706074d142914a8bb;p=ghc-hetmet.git

diff --git a/rts/Capability.c b/rts/Capability.c
index e384e1e..99c68fd 100644
--- a/rts/Capability.c
+++ b/rts/Capability.c
@@ -646,7 +646,13 @@ shutdownCapability (Capability *cap, Task *task)
 
     task->cap = cap;
 
-    for (i = 0; i < 50; i++) {
+    // Loop indefinitely until all the workers have exited and there
+    // are no Haskell threads left.  We used to bail out after 50
+    // iterations of this loop, but that occasionally left a worker
+    // running which caused problems later (the closeMutex() below
+    // isn't safe, for one thing).
+
+    for (i = 0; /* i < 50 */; i++) {
 	debugTrace(DEBUG_sched, 
 		   "shutting down capability %d, attempt %d", cap->no, i);
 	ACQUIRE_LOCK(&cap->lock);
@@ -672,8 +678,10 @@ shutdownCapability (Capability *cap, Task *task)
     // we now have the Capability, its run queue and spare workers
     // list are both empty.
 
-    // We end up here only in THREADED_RTS
-    closeMutex(&cap->lock);
+    // ToDo: we can't drop this mutex, because there might still be
+    // threads performing foreign calls that will eventually try to 
+    // return via resumeThread() and attempt to grab cap->lock.
+    // closeMutex(&cap->lock);
 }
 
 /* ----------------------------------------------------------------------------