X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2FTask.c;h=4a630843b725cec6aa1afaff7e26417dac2a06ae;hb=8b08c15b8ace5a76e341939081fbb6ad2736ddd1;hp=551f13777a645eea4f9d8023333a88db4e682754;hpb=6ffb1cec5bc6fcc834547fc456322d2eb2418ff6;p=ghc-hetmet.git

diff --git a/rts/Task.c b/rts/Task.c
index 551f137..4a63084 100644
--- a/rts/Task.c
+++ b/rts/Task.c
@@ -83,14 +83,15 @@ 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) {
 #if defined(THREADED_RTS)
         closeCondition(&task->cond);
         closeMutex(&task->lock);
 #endif
-        next = task->next;
+        next = task->all_link;
         stgFree(task);
     }
+    all_tasks = NULL;
     task_free_list = NULL;
     RELEASE_LOCK(&sched_mutex);
 }
@@ -251,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