X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2FTask.c;h=0ec60f750854cf25fbf2838a9a55ec1d8645834d;hb=0b9530245a33b8206ca38b9de6dfb01e056fd8dc;hp=72147256d80230687b7469c9cafbea4d8150a475;hpb=ab1e183aa7801f9260a9cbb6edbd553cf8249b25;p=ghc-hetmet.git

diff --git a/rts/Task.c b/rts/Task.c
index 7214725..0ec60f7 100644
--- a/rts/Task.c
+++ b/rts/Task.c
@@ -15,6 +15,7 @@
 #include "Capability.h"
 #include "Stats.h"
 #include "RtsFlags.h"
+#include "Storage.h"
 #include "Schedule.h"
 #include "Hash.h"
 #include "Trace.h"
@@ -67,22 +68,40 @@ initTaskManager (void)
 void
 stopTaskManager (void)
 {
-    Task *task, *next;
-
     debugTrace(DEBUG_sched, 
 	       "stopping task manager, %d tasks still running",
 	       tasksRunning);
+    /* nothing to do */
+}
+
+
+void
+freeTaskManager (void)
+{
+    Task *task, *next;
+
+    debugTrace(DEBUG_sched, "freeing task manager");
 
     ACQUIRE_LOCK(&sched_mutex);
-    for (task = task_free_list; task != NULL; task = next) {
-        next = task->next;
-        stgFree(task);
+    for (task = all_tasks; task != NULL; task = next) {
+        next = task->all_link;
+        if (task->stopped) {
+            // We only free resources if the Task is not in use.  A
+            // Task may still be in use if we have a Haskell thread in
+            // a foreign call while we are attempting to shut down the
+            // RTS (see conc059).
 #if defined(THREADED_RTS)
-        closeCondition(&task->cond);
-        closeMutex(&task->lock);
+            closeCondition(&task->cond);
+            closeMutex(&task->lock);
 #endif
+            stgFree(task);
+        }
     }
+    all_tasks = NULL;
     task_free_list = NULL;
+#if defined(THREADED_RTS)
+    freeThreadLocalKey(&currentTaskKey);
+#endif
     RELEASE_LOCK(&sched_mutex);
 }
 
@@ -239,9 +258,15 @@ workerTaskStop (Task *task)
     ASSERT(myTask() == task);
 #endif
 
+    task->cap = NULL;
     taskTimeStamp(task);
     task->stopped = rtsTrue;
     tasksRunning--;
+
+    ACQUIRE_LOCK(&sched_mutex);
+    task->next = task_free_list;
+    task_free_list = task;
+    RELEASE_LOCK(&sched_mutex);
 }
 
 void