diff options
| author | Eric Holk <eholk@mozilla.com> | 2011-07-29 11:00:44 -0700 |
|---|---|---|
| committer | Graydon Hoare <graydon@mozilla.com> | 2011-07-29 18:54:59 -0700 |
| commit | d1dbb99984064eedb77c0f55300430bcb35ce109 (patch) | |
| tree | 9e45ab1c525f0c59ac892117d0dd5424d29a7f51 /src/rt/rust_upcall.cpp | |
| parent | bc4e9afe2547fa88b55ffc31fef041dffe864b2b (diff) | |
| download | rust-d1dbb99984064eedb77c0f55300430bcb35ce109.tar.gz rust-d1dbb99984064eedb77c0f55300430bcb35ce109.zip | |
Removing proxies and message queues.
Diffstat (limited to 'src/rt/rust_upcall.cpp')
| -rw-r--r-- | src/rt/rust_upcall.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/rt/rust_upcall.cpp b/src/rt/rust_upcall.cpp index 794bbc9c244..048be072e12 100644 --- a/src/rt/rust_upcall.cpp +++ b/src/rt/rust_upcall.cpp @@ -169,9 +169,7 @@ upcall_clone_chan(rust_task *task, rust_task *target, extern "C" CDECL rust_task * upcall_chan_target_task(rust_task *task, rust_chan *chan) { LOG_UPCALL_ENTRY(task); - I(task->sched, !chan->port->is_proxy()); - - return chan->port->referent()->task; + return chan->port->task; } extern "C" CDECL void @@ -204,9 +202,9 @@ upcall_send(rust_task *task, rust_chan *chan, void *sptr) { extern "C" CDECL void upcall_recv(rust_task *task, uintptr_t *dptr, rust_port *port) { + LOG_UPCALL_ENTRY(task); { scoped_lock with(port->lock); - LOG_UPCALL_ENTRY(task); LOG(task, comm, "port: 0x%" PRIxPTR ", dptr: 0x%" PRIxPTR ", size: 0x%" PRIxPTR ", chan_no: %d", |