X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2FTask.c;h=4a630843b725cec6aa1afaff7e26417dac2a06ae;hb=8b08c15b8ace5a76e341939081fbb6ad2736ddd1;hp=c8cd9c4a2c19c2edf5e701c398149adf011502a3;hpb=48ff2a03397d744e4b24797d7b16fdaf6feb576a;p=ghc-hetmet.git diff --git a/rts/Task.c b/rts/Task.c index c8cd9c4..4a63084 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" @@ -28,8 +29,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 +57,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(¤tTaskKey); @@ -77,6 +71,29 @@ stopTaskManager (void) 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 = all_tasks; task != NULL; task = next) { +#if defined(THREADED_RTS) + closeCondition(&task->cond); + closeMutex(&task->lock); +#endif + next = task->all_link; + stgFree(task); + } + all_tasks = NULL; + task_free_list = NULL; + RELEASE_LOCK(&sched_mutex); } @@ -189,7 +206,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,6 +252,11 @@ workerTaskStop (Task *task) taskTimeStamp(task); task->stopped = rtsTrue; tasksRunning--; + + ACQUIRE_LOCK(&sched_mutex); + task->next = task_free_list; + task_free_list = task; + RELEASE_LOCK(&sched_mutex); } void @@ -254,9 +276,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. @@ -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); @@ -316,7 +336,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"); }