projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix a typo.
[ghc-hetmet.git]
/
rts
/
Task.c
diff --git
a/rts/Task.c
b/rts/Task.c
index
0e51dbf
..
4a63084
100644
(file)
--- a/
rts/Task.c
+++ b/
rts/Task.c
@@
-68,20
+68,10
@@
initTaskManager (void)
void
stopTaskManager (void)
{
void
stopTaskManager (void)
{
- Task *task;
-
debugTrace(DEBUG_sched,
"stopping task manager, %d tasks still running",
tasksRunning);
debugTrace(DEBUG_sched,
"stopping task manager, %d tasks still running",
tasksRunning);
-
- ACQUIRE_LOCK(&sched_mutex);
- for (task = task_free_list; task != NULL; task = task->next) {
-#if defined(THREADED_RTS)
- closeCondition(&task->cond);
- closeMutex(&task->lock);
-#endif
- }
- RELEASE_LOCK(&sched_mutex);
+ /* nothing to do */
}
}
@@
-93,10
+83,15
@@
freeTaskManager (void)
debugTrace(DEBUG_sched, "freeing task manager");
ACQUIRE_LOCK(&sched_mutex);
debugTrace(DEBUG_sched, "freeing task manager");
ACQUIRE_LOCK(&sched_mutex);
- for (task = task_free_list; task != NULL; task = next) {
- next = task->next;
+ for (task = all_tasks; task != NULL; task = next) {
+#if defined(THREADED_RTS)
+ closeCondition(&task->cond);
+ closeMutex(&task->lock);
+#endif
+ next = task->all_link;
stgFree(task);
}
stgFree(task);
}
+ all_tasks = NULL;
task_free_list = NULL;
RELEASE_LOCK(&sched_mutex);
}
task_free_list = NULL;
RELEASE_LOCK(&sched_mutex);
}
@@
-257,6
+252,11
@@
workerTaskStop (Task *task)
taskTimeStamp(task);
task->stopped = rtsTrue;
tasksRunning--;
taskTimeStamp(task);
task->stopped = rtsTrue;
tasksRunning--;
+
+ ACQUIRE_LOCK(&sched_mutex);
+ task->next = task_free_list;
+ task_free_list = task;
+ RELEASE_LOCK(&sched_mutex);
}
void
}
void