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

diff --git a/rts/Task.c b/rts/Task.c
index 7366480..9923609 100644
--- a/rts/Task.c
+++ b/rts/Task.c
@@ -99,10 +99,10 @@ newTask (void)
 #if defined(THREADED_RTS)
     currentUserTime = getThreadCPUTime();
     currentElapsedTime = getProcessElapsedTime();
-    task->mut_time = 0.0;
-    task->mut_etime = 0.0;
-    task->gc_time = 0.0;
-    task->gc_etime = 0.0;
+    task->mut_time = 0;
+    task->mut_etime = 0;
+    task->gc_time = 0;
+    task->gc_etime = 0;
     task->muttimestart = currentUserTime;
     task->elapsedtimestart = currentElapsedTime;
 #endif
@@ -193,16 +193,11 @@ discardTask (Task *task)
 }
 
 void
-taskStop (Task *task)
+taskTimeStamp (Task *task USED_IF_THREADS)
 {
 #if defined(THREADED_RTS)
-    OSThreadId id;
     Ticks currentElapsedTime, currentUserTime, elapsedGCTime;
 
-    id = osThreadId();
-    ASSERT(task->id == id);
-    ASSERT(myTask() == task);
-
     currentUserTime = getThreadCPUTime();
     currentElapsedTime = getProcessElapsedTime();
 
@@ -215,10 +210,22 @@ taskStop (Task *task)
     task->mut_etime = 
 	currentElapsedTime - task->elapsedtimestart - elapsedGCTime;
 
-    if (task->mut_time < 0.0)  { task->mut_time = 0.0;  }
-    if (task->mut_etime < 0.0) { task->mut_etime = 0.0; }
+    if (task->mut_time  < 0) { task->mut_time  = 0; }
+    if (task->mut_etime < 0) { task->mut_etime = 0; }
+#endif
+}
+
+void
+workerTaskStop (Task *task)
+{
+#if defined(THREADED_RTS)
+    OSThreadId id;
+    id = osThreadId();
+    ASSERT(task->id == id);
+    ASSERT(myTask() == task);
 #endif
 
+    taskTimeStamp(task);
     task->stopped = rtsTrue;
     tasksRunning--;
 }