projects
/
ghc-hetmet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
ca8ac44
)
freeTaskManager: don't free Tasks that are still in use
author
Simon Marlow
<simonmar@microsoft.com>
Tue, 20 Feb 2007 09:54:56 +0000
(09:54 +0000)
committer
Simon Marlow
<simonmar@microsoft.com>
Tue, 20 Feb 2007 09:54:56 +0000
(09:54 +0000)
See conc059.
rts/Task.c
patch
|
blob
|
history
diff --git
a/rts/Task.c
b/rts/Task.c
index
4a63084
..
4301ab4
100644
(file)
--- a/
rts/Task.c
+++ b/
rts/Task.c
@@
-84,12
+84,18
@@
freeTaskManager (void)
ACQUIRE_LOCK(&sched_mutex);
for (task = all_tasks; task != NULL; task = next) {
ACQUIRE_LOCK(&sched_mutex);
for (task = all_tasks; task != NULL; task = next) {
+ next = task->all_link;
+ if (task->stopped) {
+ // We only free resources if the Task is not in use. A
+ // Task may still be in use if we have a Haskell thread in
+ // a foreign call while we are attempting to shut down the
+ // RTS (see conc059).
#if defined(THREADED_RTS)
#if defined(THREADED_RTS)
- closeCondition(&task->cond);
- closeMutex(&task->lock);
+ closeCondition(&task->cond);
+ closeMutex(&task->lock);
#endif
#endif
- next = task->all_link;
- stgFree(task);
+ stgFree(task);
+ }
}
all_tasks = NULL;
task_free_list = NULL;
}
all_tasks = NULL;
task_free_list = NULL;