Ensure runhaskell is rebuild in stage2

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

diff --git a/rts/Task.c b/rts/Task.c
index 57497e4..0ec60f7 100644 (file)
--- 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,18 +68,40 @@ 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; next) {
-        next = task->next;
-        stgFree(task);
+    for (task = all_tasks; task != NULL; task = next) {
+        next = task->all_link;
+        if (task->stopped) {
+            // We only free resources if the Task is not in use.  A
+            // Task may still be in use if we have a Haskell thread in
+            // a foreign call while we are attempting to shut down the
+            // RTS (see conc059).
+#if defined(THREADED_RTS)
+            closeCondition(&task->cond);
+            closeMutex(&task->lock);
+#endif
+            stgFree(task);
+        }
     }
+    all_tasks = NULL;
     task_free_list = NULL;
+#if defined(THREADED_RTS)
+    freeThreadLocalKey(&currentTaskKey);
+#endif
     RELEASE_LOCK(&sched_mutex);
 }
 
@@ -192,7 +215,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;
@@ -235,9 +258,15 @@ workerTaskStop (Task *task)
     ASSERT(myTask() == task);
 #endif
 
+    task->cap = NULL;
     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 +308,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 +346,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");
            }