newTask (void)
{
#if defined(THREADED_RTS)
- long currentElapsedTime, currentUserTime, elapsedGCTime;
+ Ticks currentElapsedTime, currentUserTime;
#endif
Task *task;
#endif
#if defined(THREADED_RTS)
- stat_getTimes(¤tElapsedTime, ¤tUserTime, &elapsedGCTime);
+ currentUserTime = getThreadCPUTime();
+ currentElapsedTime = getProcessElapsedTime();
task->mut_time = 0.0;
task->mut_etime = 0.0;
task->gc_time = 0.0;
IF_DEBUG(scheduler,sched_belch("task exiting"));
}
+#ifdef THREADED_RTS
+#define TASK_ID(t) (t)->id
+#else
+#define TASK_ID(t) (t)
+#endif
+
void
discardTask (Task *task)
{
ASSERT_LOCK_HELD(&sched_mutex);
-#if defined(THREADED_RTS)
- closeCondition(&task->cond);
-#endif
- task->stopped = rtsTrue;
- task->cap = NULL;
- task->next = task_free_list;
- task_free_list = task;
+ if (!task->stopped) {
+ IF_DEBUG(scheduler,sched_belch("discarding task %p", TASK_ID(task)));
+ task->cap = NULL;
+ task->tso = NULL;
+ task->stopped = rtsTrue;
+ tasksRunning--;
+ task->next = task_free_list;
+ task_free_list = task;
+ }
}
void
{
#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(¤tElapsedTime, ¤tUserTime, &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;