X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2FTask.c;h=588d414d875a9d20232a1cfd678a017442ecaaeb;hb=3cdb0ada5aecbcbe940bacf577c02c41bc65c629;hp=57497e427b93a4c3f56f7c2e79ed6836531b6aff;hpb=7b8b90403e97320661ea17920a257e0bf530c206;p=ghc-hetmet.git

diff --git a/rts/Task.c b/rts/Task.c
index 57497e4..588d414 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"
@@ -74,8 +75,12 @@ stopTaskManager (void)
 	       tasksRunning);
 
     ACQUIRE_LOCK(&sched_mutex);
-    for (task = task_free_list; task != NULL; next) {
+    for (task = task_free_list; task != NULL; task = next) {
         next = task->next;
+#if defined(THREADED_RTS)
+        closeCondition(&task->cond);
+        closeMutex(&task->lock);
+#endif
         stgFree(task);
     }
     task_free_list = NULL;
@@ -192,7 +197,7 @@ discardTask (Task *task)
 {
     ASSERT_LOCK_HELD(&sched_mutex);
     if (!task->stopped) {
-	debugTrace(DEBUG_sched, "discarding task %ld", TASK_ID(task));
+	debugTrace(DEBUG_sched, "discarding task %ld", (long)TASK_ID(task));
 	task->cap = NULL;
 	task->tso = NULL;
 	task->stopped = rtsTrue;
@@ -279,7 +284,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);
@@ -316,7 +322,7 @@ printAllTasks(void)
 		debugBelch("on capability %d, ", task->cap->no);
 	    }
 	    if (task->tso) {
-		debugBelch("bound to thread %d", task->tso->id);
+	      debugBelch("bound to thread %lu", (unsigned long)task->tso->id);
 	    } else {
 		debugBelch("worker");
 	    }