diff options
| author | Eric Holk <eholk@mozilla.com> | 2011-06-16 12:18:54 -0700 |
|---|---|---|
| committer | Eric Holk <eholk@mozilla.com> | 2011-06-16 12:23:13 -0700 |
| commit | 6ed6791df49d8f33a3f49662e7baf559ef59e604 (patch) | |
| tree | 08a9b5ed1b18331da8280bf2d9fa2b61f6fcac9e /src/rt/rust_upcall.cpp | |
| parent | a5563e173e705fcc03c5bcc91a7c0ff620fc7b57 (diff) | |
| download | rust-6ed6791df49d8f33a3f49662e7baf559ef59e604.tar.gz rust-6ed6791df49d8f33a3f49662e7baf559ef59e604.zip | |
Removing dead upcall_join. Closes #509.
Diffstat (limited to 'src/rt/rust_upcall.cpp')
| -rw-r--r-- | src/rt/rust_upcall.cpp | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/src/rt/rust_upcall.cpp b/src/rt/rust_upcall.cpp index bfb72ffd648..1a0d4f8c0b0 100644 --- a/src/rt/rust_upcall.cpp +++ b/src/rt/rust_upcall.cpp @@ -195,27 +195,6 @@ upcall_sleep(rust_task *task, size_t time_in_us) { task->yield(2, time_in_us); } -extern "C" CDECL void -upcall_join(rust_task *task, maybe_proxy<rust_task> *target) { - LOG_UPCALL_ENTRY(task); - - if (target->is_proxy()) { - rust_handle<rust_task> *task_handle = target->as_proxy()->handle(); - notify_message::send(notify_message::JOIN, "join", - task->get_handle(), task_handle); - task->block(task_handle, "joining remote task"); - task->yield(2); - } else { - rust_task *target_task = target->referent(); - // If the other task is already dying, we don't have to wait for it. - if (target_task->dead() == false) { - target_task->tasks_waiting_to_join.push(task); - task->block(target_task, "joining local task"); - task->yield(2); - } - } -} - /** * Buffers a chunk of data in the specified channel. * |
