projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove more Addr bits
[ghc-hetmet.git]
/
rts
/
Task.c
diff --git
a/rts/Task.c
b/rts/Task.c
index
918dc55
..
c8cd9c4
100644
(file)
--- a/
rts/Task.c
+++ b/
rts/Task.c
@@
-58,7
+58,11
@@
initTaskManager (void)
taskCount = 0;
workerCount = 0;
tasksRunning = 0;
taskCount = 0;
workerCount = 0;
tasksRunning = 0;
+#if defined(THREADED_RTS)
+ maxWorkers = DEFAULT_MAX_WORKERS * RtsFlags.ParFlags.nNodes;
+#else
maxWorkers = DEFAULT_MAX_WORKERS;
maxWorkers = DEFAULT_MAX_WORKERS;
+#endif
initialized = 1;
#if defined(THREADED_RTS)
newThreadLocalKey(¤tTaskKey);
initialized = 1;
#if defined(THREADED_RTS)
newThreadLocalKey(¤tTaskKey);
@@
-185,7
+189,7
@@
discardTask (Task *task)
{
ASSERT_LOCK_HELD(&sched_mutex);
if (!task->stopped) {
{
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;
task->cap = NULL;
task->tso = NULL;
task->stopped = rtsTrue;
@@
-236,7
+240,7
@@
workerTaskStop (Task *task)
void
resetTaskManagerAfterFork (void)
{
void
resetTaskManagerAfterFork (void)
{
-#warning TODO!
+ // TODO!
taskCount = 0;
}
taskCount = 0;
}