Moved thread management to rust_kernel.

This commit is contained in:
Eric Holk
2011-06-24 16:50:06 -07:00
committed by Graydon Hoare
parent c6d8324830
commit f6f945fed5
9 changed files with 91 additions and 86 deletions

View File

@@ -391,16 +391,16 @@ task_yield(rust_task *task) {
extern "C" CDECL void
task_join(rust_task *task, rust_task *join_task) {
task->dom->scheduler_lock.lock();
task->kernel->scheduler_lock.lock();
// If the other task is already dying, we don't have to wait for it.
if (join_task->dead() == false) {
join_task->tasks_waiting_to_join.push(task);
task->block(join_task, "joining local task");
task->dom->scheduler_lock.unlock();
task->kernel->scheduler_lock.unlock();
task->yield(2);
}
else {
task->dom->scheduler_lock.unlock();
task->kernel->scheduler_lock.unlock();
}
}