From f6f945fed5c8d1061d80b444331910df29afa392 Mon Sep 17 00:00:00 2001 From: Eric Holk Date: Fri, 24 Jun 2011 16:50:06 -0700 Subject: Moved thread management to rust_kernel. --- src/rt/rust_builtin.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/rt/rust_builtin.cpp') diff --git a/src/rt/rust_builtin.cpp b/src/rt/rust_builtin.cpp index 27fe45e42d7..2a724ee1791 100644 --- a/src/rt/rust_builtin.cpp +++ b/src/rt/rust_builtin.cpp @@ -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(); } } -- cgit 1.4.1-3-g733a5