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

diff --git a/rts/Capability.c b/rts/Capability.c
index e384e1e..7fc1c57 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);