X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2FTask.c;h=c8cd9c4a2c19c2edf5e701c398149adf011502a3;hb=73566e25d75588185b0581722406da5c48965c51;hp=992360988464b957e07961e89db41f96a2d166f7;hpb=a91cc8496bf4ea7fe1e3ad9d97836152f3939ffa;p=ghc-hetmet.git

diff --git a/rts/Task.c b/rts/Task.c
index 9923609..c8cd9c4 100644
--- a/rts/Task.c
+++ b/rts/Task.c
@@ -17,6 +17,7 @@
 #include "RtsFlags.h"
 #include "Schedule.h"
 #include "Hash.h"
+#include "Trace.h"
 
 #if HAVE_SIGNAL_H
 #include <signal.h>
@@ -57,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(&currentTaskKey);
@@ -69,7 +74,9 @@ initTaskManager (void)
 void
 stopTaskManager (void)
 {
-    IF_DEBUG(scheduler, sched_belch("stopping task manager, %d tasks still running", tasksRunning));
+    debugTrace(DEBUG_sched, 
+	       "stopping task manager, %d tasks still running",
+	       tasksRunning);
 }
 
 
@@ -144,7 +151,7 @@ newBoundTask (void)
 
     taskEnter(task);
 
-    IF_DEBUG(scheduler,sched_belch("new task (taskCount: %d)", taskCount););
+    debugTrace(DEBUG_sched, "new task (taskCount: %d)", taskCount);
     return task;
 }
 
@@ -168,7 +175,7 @@ boundTaskExiting (Task *task)
     task_free_list = task;
     RELEASE_LOCK(&sched_mutex);
 
-    IF_DEBUG(scheduler,sched_belch("task exiting"));
+    debugTrace(DEBUG_sched, "task exiting");
 }
 
 #ifdef THREADED_RTS
@@ -182,7 +189,7 @@ discardTask (Task *task)
 {
     ASSERT_LOCK_HELD(&sched_mutex);
     if (!task->stopped) {
-	IF_DEBUG(scheduler,sched_belch("discarding task %p", TASK_ID(task)));
+	debugTrace(DEBUG_sched, "discarding task %ld", TASK_ID(task));
 	task->cap = NULL;
 	task->tso = NULL;
 	task->stopped = rtsTrue;
@@ -233,7 +240,7 @@ workerTaskStop (Task *task)
 void
 resetTaskManagerAfterFork (void)
 {
-#warning TODO!
+    // TODO!
     taskCount = 0;
 }
 
@@ -275,7 +282,7 @@ startWorkerTask (Capability *cap,
     barf("startTask: Can't create new task");
   }
 
-  IF_DEBUG(scheduler,sched_belch("new worker task (taskCount: %d)", taskCount););
+  debugTrace(DEBUG_sched, "new worker task (taskCount: %d)", taskCount);
 
   task->id = tid;