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

diff --git a/rts/Task.c b/rts/Task.c
index 3be5b28..4a63084 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,17 +68,30 @@ 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;
+    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);
 }
@@ -238,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
@@ -279,7 +298,8 @@ startWorkerTask (Capability *cap,
 
   r = createOSThread(&tid, (OSThreadProc *)taskStart, task);
   if (r != 0) {
-    barf("startTask: Can't create new task");
+    sysErrorBelch("failed to create OS thread");
+    stg_exit(EXIT_FAILURE);
   }
 
   debugTrace(DEBUG_sched, "new worker task (taskCount: %d)", taskCount);