diff options
| author | Eric Holk <eholk@mozilla.com> | 2011-06-24 16:50:06 -0700 |
|---|---|---|
| committer | Graydon Hoare <graydon@mozilla.com> | 2011-06-28 16:12:33 -0700 |
| commit | f6f945fed5c8d1061d80b444331910df29afa392 (patch) | |
| tree | 1ee8908830878e916d26cbae145b00771d5c9c9d /src/rt/rust_builtin.cpp | |
| parent | c6d83248301b4aed366b9bef682d200381324c01 (diff) | |
| download | rust-f6f945fed5c8d1061d80b444331910df29afa392.tar.gz rust-f6f945fed5c8d1061d80b444331910df29afa392.zip | |
Moved thread management to rust_kernel.
Diffstat (limited to 'src/rt/rust_builtin.cpp')
| -rw-r--r-- | src/rt/rust_builtin.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
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(); } } |