X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2FTask.c;h=4a630843b725cec6aa1afaff7e26417dac2a06ae;hb=5f8b35ad729740cab1cb8c884deb405dcc758683;hp=0e51dbf1248655c9aa8e5718e81743b062a22f0b;hpb=cf6b495d8f6d8f08fd6603c5ba2ec7a6acf7ac01;p=ghc-hetmet.git

diff --git a/rts/Task.c b/rts/Task.c
index 0e51dbf..4a63084 100644
--- a/rts/Task.c
+++ b/rts/Task.c
@@ -68,20 +68,10 @@ initTaskManager (void)
 void
 stopTaskManager (void)
 {
-    Task *task;
-
     debugTrace(DEBUG_sched, 
 	       "stopping task manager, %d tasks still running",
 	       tasksRunning);
-
-    ACQUIRE_LOCK(&sched_mutex);
-    for (task = task_free_list; task != NULL; task = task->next) {
-#if defined(THREADED_RTS)
-        closeCondition(&task->cond);
-        closeMutex(&task->lock);
-#endif
-    }
-    RELEASE_LOCK(&sched_mutex);
+    /* nothing to do */
 }
 
 
@@ -93,10 +83,15 @@ freeTaskManager (void)
     debugTrace(DEBUG_sched, "freeing task manager");
 
     ACQUIRE_LOCK(&sched_mutex);
-    for (task = task_free_list; task != NULL; task = next) {
-        next = task->next;
+    for (task = all_tasks; task != NULL; task = next) {
+#if defined(THREADED_RTS)
+        closeCondition(&task->cond);
+        closeMutex(&task->lock);
+#endif
+        next = task->all_link;
         stgFree(task);
     }
+    all_tasks = NULL;
     task_free_list = NULL;
     RELEASE_LOCK(&sched_mutex);
 }
@@ -257,6 +252,11 @@ workerTaskStop (Task *task)
     taskTimeStamp(task);
     task->stopped = rtsTrue;
     tasksRunning--;
+
+    ACQUIRE_LOCK(&sched_mutex);
+    task->next = task_free_list;
+    task_free_list = task;
+    RELEASE_LOCK(&sched_mutex);
 }
 
 void