projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix non-threaded way
[ghc-hetmet.git]
/
ghc
/
rts
/
Task.c
diff --git
a/ghc/rts/Task.c
b/ghc/rts/Task.c
index
b8bf1c4
..
89db782
100644
(file)
--- a/
ghc/rts/Task.c
+++ b/
ghc/rts/Task.c
@@
-97,7
+97,8
@@
newTask (void)
#endif
#if defined(THREADED_RTS)
#endif
#if defined(THREADED_RTS)
- getProcessTimes(¤tUserTime, ¤tElapsedTime);
+ currentUserTime = getThreadCPUTime();
+ currentElapsedTime = getProcessElapsedTime();
task->mut_time = 0.0;
task->mut_etime = 0.0;
task->gc_time = 0.0;
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);
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
#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
}
void
@@
-194,7
+203,8
@@
taskStop (Task *task)
ASSERT(task->id == id);
ASSERT(myTask() == task);
ASSERT(task->id == id);
ASSERT(myTask() == task);
- getProcessTimes(¤tUserTime, ¤tElapsedTime);
+ currentUserTime = getThreadCPUTime();
+ currentElapsedTime = getProcessElapsedTime();
// XXX this is wrong; we want elapsed GC time since the
// Task started.
// XXX this is wrong; we want elapsed GC time since the
// Task started.