X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=rts%2FTask.c;h=0ec60f750854cf25fbf2838a9a55ec1d8645834d;hp=9aa43c08c21e5e9b761cf53926546134cabb94e6;hb=c004ec62b41aa2137b5b5e298ca562609b0de92e;hpb=5d48ad2707548f077e2856b41c4864f6a1efb3cc

diff --git a/rts/Task.c b/rts/Task.c
index 9aa43c0..0ec60f7 100644
--- a/rts/Task.c
+++ b/rts/Task.c
@@ -83,15 +83,25 @@ freeTaskManager (void)
     debugTrace(DEBUG_sched, "freeing task manager");
 
     ACQUIRE_LOCK(&sched_mutex);
-    for (task = task_free_list; task != NULL; task = next) {
+    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
-        next = task->next;
-        stgFree(task);
+            stgFree(task);
+        }
     }
+    all_tasks = NULL;
     task_free_list = NULL;
+#if defined(THREADED_RTS)
+    freeThreadLocalKey(&currentTaskKey);
+#endif
     RELEASE_LOCK(&sched_mutex);
 }
 
@@ -248,6 +258,7 @@ workerTaskStop (Task *task)
     ASSERT(myTask() == task);
 #endif
 
+    task->cap = NULL;
     taskTimeStamp(task);
     task->stopped = rtsTrue;
     tasksRunning--;