Add Coercion.lhs

[ghc-hetmet.git] / rts / Task.c

diff --git a/rts/Task.c b/rts/Task.c
index 57497e4..11307a7 100644 (file)
--- a/rts/Task.c
+++ b/rts/Task.c
@@ -74,8 +74,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 +196,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 +283,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 +321,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");
            }