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_port.cpp | |
| parent | bc4e9afe2547fa88b55ffc31fef041dffe864b2b (diff) | |
| download | rust-d1dbb99984064eedb77c0f55300430bcb35ce109.tar.gz rust-d1dbb99984064eedb77c0f55300430bcb35ce109.zip | |
Removing proxies and message queues.
Diffstat (limited to 'src/rt/rust_port.cpp')
| -rw-r--r-- | src/rt/rust_port.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/rt/rust_port.cpp b/src/rt/rust_port.cpp index 18acb38cc1d..bd4cff4f235 100644 --- a/src/rt/rust_port.cpp +++ b/src/rt/rust_port.cpp @@ -2,7 +2,7 @@ #include "rust_port.h" rust_port::rust_port(rust_task *task, size_t unit_sz) - : maybe_proxy<rust_port>(this), kernel(task->kernel), task(task), + : ref_count(1), kernel(task->kernel), task(task), unit_sz(unit_sz), writers(task), chans(task) { LOG(task, comm, @@ -17,11 +17,9 @@ rust_port::rust_port(rust_task *task, size_t unit_sz) rust_port::~rust_port() { LOG(task, comm, "~rust_port 0x%" PRIxPTR, (uintptr_t) this); - // log_state(); - // Disassociate channels from this port. while (chans.is_empty() == false) { - scoped_lock with(referent()->lock); + scoped_lock with(lock); rust_chan *chan = chans.peek(); chan->disassociate(); |