X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2FTask.c;h=c8cd9c4a2c19c2edf5e701c398149adf011502a3;hb=73566e25d75588185b0581722406da5c48965c51;hp=918dc559b83a3967060cb86b24e8a6c877ab1233;hpb=5a2769f0273dd389977e8283375e7920d183bdd4;p=ghc-hetmet.git diff --git a/rts/Task.c b/rts/Task.c index 918dc55..c8cd9c4 100644 --- a/rts/Task.c +++ b/rts/Task.c @@ -58,7 +58,11 @@ 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); @@ -185,7 +189,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; @@ -236,7 +240,7 @@ workerTaskStop (Task *task) void resetTaskManagerAfterFork (void) { -#warning TODO! + // TODO! taskCount = 0; }