fix non-threaded way

[ghc-hetmet.git] / ghc / rts / Task.c

diff --git a/ghc/rts/Task.c b/ghc/rts/Task.c
index 683c665..89db782 100644 (file)
--- a/ghc/rts/Task.c
+++ b/ghc/rts/Task.c
@@ -77,7 +77,7 @@ static Task*
 newTask (void)
 {
 #if defined(THREADED_RTS)
-    long currentElapsedTime, currentUserTime, elapsedGCTime;
+    Ticks currentElapsedTime, currentUserTime;
 #endif
     Task *task;
 
@@ -97,7 +97,8 @@ newTask (void)
 #endif
 
 #if defined(THREADED_RTS)
-    stat_getTimes(&currentElapsedTime, &currentUserTime, &elapsedGCTime);
+    currentUserTime = getThreadCPUTime();
+    currentElapsedTime = getProcessElapsedTime();
     task->mut_time = 0.0;
     task->mut_etime = 0.0;
     task->gc_time = 0.0;
@@ -174,13 +175,21 @@ void
 discardTask (Task *task)
 {
     ASSERT_LOCK_HELD(&sched_mutex);
-#if defined(THREADED_RTS)
-    closeCondition(&task->cond);
+    if (!task->stopped) {
+       IF_DEBUG(scheduler,sched_belch("discarding task %p",
+#ifdef THREADED_RTS
+                                      (void *)task->id
+#else
+                                      (void *)task
 #endif
-    task->stopped = rtsTrue;
-    task->cap = NULL;
-    task->next = task_free_list;
-    task_free_list = task;
+                    ));
+       task->cap = NULL;
+       task->tso = NULL;
+       task->stopped = rtsTrue;
+       tasksRunning--;
+       task->next = task_free_list;
+       task_free_list = task;
+    }
 }
 
 void
@@ -188,13 +197,18 @@ taskStop (Task *task)
 {
 #if defined(THREADED_RTS)
     OSThreadId id;
-    long currentElapsedTime, currentUserTime, elapsedGCTime;
+    Ticks currentElapsedTime, currentUserTime, elapsedGCTime;
 
     id = osThreadId();
     ASSERT(task->id == id);
     ASSERT(myTask() == task);
 
-    stat_getTimes(&currentElapsedTime, &currentUserTime, &elapsedGCTime);
+    currentUserTime = getThreadCPUTime();
+    currentElapsedTime = getProcessElapsedTime();
+
+    // XXX this is wrong; we want elapsed GC time since the
+    // Task started.
+    elapsedGCTime = stat_getElapsedGCTime();
     
     task->mut_time = 
        currentUserTime - task->muttimestart - task->gc_time;