X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2FTask.c;h=dcfa5b5aee629919da4d0e7c8d4c133d3a7592ff;hb=45c35148be308b3290f1c14240d406f1cb1af166;hp=8779e292ef7d14578f6e94d637c3483aa11f3cc3;hpb=c58450c0c62dc9bf74ecd5df3c07a3f1ce511e7f;p=ghc-hetmet.git

diff --git a/rts/Task.c b/rts/Task.c
index 8779e29..dcfa5b5 100644
--- a/rts/Task.c
+++ b/rts/Task.c
@@ -28,8 +28,6 @@
 Task *all_tasks = NULL;
 static Task *task_free_list = NULL; // singly-linked
 static nat taskCount;
-#define DEFAULT_MAX_WORKERS 64
-static nat maxWorkers; // we won't create more workers than this
 static nat tasksRunning;
 static nat workerCount;
 
@@ -58,11 +56,6 @@ initTaskManager (void)
 	taskCount = 0;
 	workerCount = 0;
 	tasksRunning = 0;
-#if defined(THREADED_RTS)
-	maxWorkers = DEFAULT_MAX_WORKERS * RtsFlags.ParFlags.nNodes;
-#else
-	maxWorkers = DEFAULT_MAX_WORKERS;
-#endif
 	initialized = 1;
 #if defined(THREADED_RTS)
 	newThreadLocalKey(&currentTaskKey);
@@ -74,9 +67,19 @@ initTaskManager (void)
 void
 stopTaskManager (void)
 {
+    Task *task, *next;
+
     debugTrace(DEBUG_sched, 
 	       "stopping task manager, %d tasks still running",
 	       tasksRunning);
+
+    ACQUIRE_LOCK(&sched_mutex);
+    for (task = task_free_list; task != NULL; task = next) {
+        next = task->next;
+        stgFree(task);
+    }
+    task_free_list = NULL;
+    RELEASE_LOCK(&sched_mutex);
 }
 
 
@@ -189,7 +192,7 @@ discardTask (Task *task)
 {
     ASSERT_LOCK_HELD(&sched_mutex);
     if (!task->stopped) {
-	debugTrace(DEBUG_sched, "discarding task %p", TASK_ID(task));
+	debugTrace(DEBUG_sched, "discarding task %ld", TASK_ID(task));
 	task->cap = NULL;
 	task->tso = NULL;
 	task->stopped = rtsTrue;
@@ -240,7 +243,7 @@ workerTaskStop (Task *task)
 void
 resetTaskManagerAfterFork (void)
 {
-#warning TODO!
+    // TODO!
     taskCount = 0;
 }
 
@@ -254,9 +257,6 @@ startWorkerTask (Capability *cap,
   OSThreadId tid;
   Task *task;
 
-  if (workerCount >= maxWorkers) {
-      barf("too many workers; runaway worker creation?");
-  }
   workerCount++;
 
   // A worker always gets a fresh Task structure.