Add several new record features

[ghc-hetmet.git] / rts / Capability.c

diff --git a/rts/Capability.c b/rts/Capability.c
index 1d282f0..73a3427 100644 (file)
--- a/rts/Capability.c
+++ b/rts/Capability.c
@@ -23,7 +23,6 @@
 #include "STM.h"
 #include "OSThreads.h"
 #include "Capability.h"
-#include "Storage.h"
 #include "Schedule.h"
 #include "Sparks.h"
 #include "Trace.h"
@@ -665,6 +664,30 @@ shutdownCapability (Capability *cap, Task *task)
            continue;
        }
        cap->running_task = task;
+
+        if (cap->spare_workers) {
+            // Look for workers that have died without removing
+            // themselves from the list; this could happen if the OS
+            // summarily killed the thread, for example.  This
+            // actually happens on Windows when the system is
+            // terminating the program, and the RTS is running in a
+            // DLL.
+            Task *t, *prev;
+            prev = NULL;
+            for (t = cap->spare_workers; t != NULL; t = t->next) {
+                if (!osThreadIsAlive(t->id)) {
+                    debugTrace(DEBUG_sched, 
+                               "worker thread %p has died unexpectedly", (void *)t->id);
+                        if (!prev) {
+                            cap->spare_workers = t->next;
+                        } else {
+                            prev->next = t->next;
+                        }
+                        prev = t;
+                }
+            }
+        }
+
        if (!emptyRunQueue(cap) || cap->spare_workers) {
            debugTrace(DEBUG_sched, 
                       "runnable threads or workers still alive, yielding");
@@ -674,6 +697,7 @@ shutdownCapability (Capability *cap, Task *task)
            continue;
        }
        debugTrace(DEBUG_sched, "capability %d is stopped.", cap->no);
+    freeCapability(cap);
        RELEASE_LOCK(&cap->lock);
        break;
     }
@@ -711,4 +735,11 @@ tryGrabCapability (Capability *cap, Task *task)
 
 #endif /* THREADED_RTS */
 
+void
+freeCapability (Capability *cap) {
+    stgFree(cap->mut_lists);
+#if defined(THREADED_RTS) || defined(PARALLEL_HASKELL)
+    freeSparkPool(&cap->r.rSparks);
+#endif
+}