diff options
| author | Michael Bebenita <mbebenita@mozilla.com> | 2010-08-17 23:26:43 -0700 |
|---|---|---|
| committer | Michael Bebenita <mbebenita@mozilla.com> | 2010-08-17 23:49:57 -0700 |
| commit | e20752de68fe336e9fa184bef0616e31c738452c (patch) | |
| tree | cc2280b968295fbe7c75244a5569c69ca00ef775 /src/rt/rust_upcall.cpp | |
| parent | 7ff39ea448c60e5ab993bb4a32649e60de13184d (diff) | |
| download | rust-e20752de68fe336e9fa184bef0616e31c738452c.tar.gz rust-e20752de68fe336e9fa184bef0616e31c738452c.zip | |
Added labels to blocking conditions.
Diffstat (limited to 'src/rt/rust_upcall.cpp')
| -rw-r--r-- | src/rt/rust_upcall.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/rt/rust_upcall.cpp b/src/rt/rust_upcall.cpp index fb85233c570..a3373870b5f 100644 --- a/src/rt/rust_upcall.cpp +++ b/src/rt/rust_upcall.cpp @@ -191,13 +191,13 @@ upcall_join(rust_task *task, maybe_proxy<rust_task> *target) { if (target->is_proxy()) { notify_message:: send(notify_message::JOIN, "join", task, target->as_proxy()); - task->block(target_task); + task->block(target_task, "joining remote task"); task->yield(2); } else { // 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); + task->block(target_task, "joining local task"); task->yield(2); } } @@ -238,7 +238,7 @@ upcall_recv(rust_task *task, uintptr_t *dptr, rust_port *port) { task->log(rust_log::COMM, "<=== waiting for rendezvous data ==="); task->rendezvous_ptr = dptr; - task->block(port); + task->block(port, "waiting for rendezvous data"); task->yield(3); } |
