diff options
| author | Eric Holk <eholk@mozilla.com> | 2011-07-06 12:48:43 -0700 |
|---|---|---|
| committer | Eric Holk <eholk@mozilla.com> | 2011-07-07 18:22:27 -0700 |
| commit | a0f45f4456de5e9811d80b20df243d7078c45918 (patch) | |
| tree | a19f9015bec2914413a3fe98bbdcaea0511ded28 /src/rt/rust_builtin.cpp | |
| parent | e7111fe1473733e78775e280c0e597a2897d4411 (diff) | |
| download | rust-a0f45f4456de5e9811d80b20df243d7078c45918.tar.gz rust-a0f45f4456de5e9811d80b20df243d7078c45918.zip | |
Removing most of the locks in rust_upcall.cpp and elsewhere.
Diffstat (limited to 'src/rt/rust_builtin.cpp')
| -rw-r--r-- | src/rt/rust_builtin.cpp | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/rt/rust_builtin.cpp b/src/rt/rust_builtin.cpp index 872a317ca38..32e12e71058 100644 --- a/src/rt/rust_builtin.cpp +++ b/src/rt/rust_builtin.cpp @@ -392,17 +392,12 @@ task_yield(rust_task *task) { extern "C" CDECL void task_join(rust_task *task, rust_task *join_task) { - 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->kernel->scheduler_lock.unlock(); task->yield(2); } - else { - task->kernel->scheduler_lock.unlock(); - } } /* Debug builtins for std.dbg. */ |