}
}
-
-void
-stopTaskManager (void)
+nat
+freeTaskManager (void)
{
Task *task, *next;
- debugTrace(DEBUG_sched,
- "stopping task manager, %d tasks still running",
- tasksRunning);
+ ASSERT_LOCK_HELD(&sched_mutex);
- ACQUIRE_LOCK(&sched_mutex);
- for (task = task_free_list; task != NULL; task = next) {
- next = task->next;
+ debugTrace(DEBUG_sched, "freeing task manager, %d tasks still running",
+ tasksRunning);
+
+ 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
- stgFree(task);
+ stgFree(task);
+ }
}
+ all_tasks = NULL;
task_free_list = NULL;
- RELEASE_LOCK(&sched_mutex);
+#if defined(THREADED_RTS)
+ freeThreadLocalKey(¤tTaskKey);
+#endif
+
+ return tasksRunning;
}
#endif
Task *task;
- task = stgMallocBytes(sizeof(Task), "newTask");
+#define ROUND_TO_CACHE_LINE(x) ((((x)+63) / 64) * 64)
+ task = stgMallocBytes(ROUND_TO_CACHE_LINE(sizeof(Task)), "newTask");
task->cap = NULL;
task->stopped = rtsFalse;
all_tasks = task;
taskCount++;
- workerCount++;
return task;
}
void
boundTaskExiting (Task *task)
{
+ task->tso = NULL;
task->stopped = rtsTrue;
task->cap = NULL;
if (!task->stopped) {
debugTrace(DEBUG_sched, "discarding task %ld", (long)TASK_ID(task));
task->cap = NULL;
- task->tso = NULL;
+ if (task->tso == NULL) {
+ workerCount--;
+ } else {
+ task->tso = NULL;
+ }
task->stopped = rtsTrue;
tasksRunning--;
task->next = task_free_list;
ASSERT(myTask() == task);
#endif
+ task->cap = NULL;
taskTimeStamp(task);
task->stopped = rtsTrue;
tasksRunning--;
+ workerCount--;
+
+ ACQUIRE_LOCK(&sched_mutex);
+ task->next = task_free_list;
+ task_free_list = task;
+ RELEASE_LOCK(&sched_mutex);
}
void