#endif
// Task lists and global counters.
-// Locks required: sched_mutex.
+// Locks required: all_tasks_mutex.
Task *all_tasks = NULL;
static nat taskCount;
static int tasksInitialized = 0;
static Task * allocTask (void);
static Task * newTask (rtsBool);
+#if defined(THREADED_RTS)
+static Mutex all_tasks_mutex;
+#endif
+
/* -----------------------------------------------------------------------------
* Remembering the current thread's Task
* -------------------------------------------------------------------------- */
tasksInitialized = 1;
#if defined(THREADED_RTS) && !defined(MYTASK_USE_TLV)
newThreadLocalKey(¤tTaskKey);
+ initMutex(&all_tasks_mutex);
#endif
}
}
Task *task, *next;
nat tasksRunning = 0;
- ASSERT_LOCK_HELD(&sched_mutex);
+ ACQUIRE_LOCK(&all_tasks_mutex);
for (task = all_tasks; task != NULL; task = next) {
next = task->all_link;
tasksRunning);
all_tasks = NULL;
+
+ RELEASE_LOCK(&all_tasks_mutex);
+
#if defined(THREADED_RTS) && !defined(MYTASK_USE_TLV)
+ closeMutex(&all_tasks_mutex);
freeThreadLocalKey(¤tTaskKey);
#endif
task->worker = worker;
task->stopped = rtsFalse;
task->running_finalizers = rtsFalse;
- task->stat = NoStatus;
- task->ret = NULL;
task->n_spare_incalls = 0;
task->spare_incalls = NULL;
task->incall = NULL;
task->next = NULL;
- ACQUIRE_LOCK(&sched_mutex);
+ ACQUIRE_LOCK(&all_tasks_mutex);
task->all_link = all_tasks;
all_tasks = task;
taskCount++;
- RELEASE_LOCK(&sched_mutex);
+ RELEASE_LOCK(&all_tasks_mutex);
return task;
}
incall->task = task;
incall->suspended_tso = NULL;
incall->suspended_cap = NULL;
+ incall->stat = NoStatus;
+ incall->ret = NULL;
incall->next = NULL;
incall->prev = NULL;
incall->prev_stack = task->incall;
Task *task, *next;
// Wipe the task list, except the current Task.
- ACQUIRE_LOCK(&sched_mutex);
+ ACQUIRE_LOCK(&all_tasks_mutex);
for (task = all_tasks; task != NULL; task=next) {
next = task->all_link;
if (task != keep) {
}
all_tasks = keep;
keep->all_link = NULL;
- RELEASE_LOCK(&sched_mutex);
+ RELEASE_LOCK(&all_tasks_mutex);
}
void