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

diff --git a/rts/Task.c b/rts/Task.c
index 3be5b28..0e51dbf 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,13 +68,31 @@ initTaskManager (void)
 void
 stopTaskManager (void)
 {
-    Task *task, *next;
+    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);
+}
+
+
+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);
@@ -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);