diff options
| -rw-r--r-- | rts/Task.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/rts/Task.c b/rts/Task.c index 4a630843b7..4301ab4b59 100644 --- 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) { + 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) - closeCondition(&task->cond); - closeMutex(&task->lock); + closeCondition(&task->cond); + closeMutex(&task->lock); #endif - next = task->all_link; - stgFree(task); + stgFree(task); + } } all_tasks = NULL; task_free_list = NULL; |