diff options
| author | Eric Holk <eholk@mozilla.com> | 2011-06-28 12:15:41 -0700 |
|---|---|---|
| committer | Graydon Hoare <graydon@mozilla.com> | 2011-06-28 16:12:33 -0700 |
| commit | 657e5a2bd579f7f1698f8ba88cb1142ced7a477f (patch) | |
| tree | 46ed664d666330679e343cde537b9d9e3f33b3e3 /src/rt/rust_chan.cpp | |
| parent | 02f6645fca946fd7cb9f55036c05a908f0567ceb (diff) | |
| download | rust-657e5a2bd579f7f1698f8ba88cb1142ced7a477f.tar.gz rust-657e5a2bd579f7f1698f8ba88cb1142ced7a477f.zip | |
Renamed what's left of rust_dom to rust_scheduler
Diffstat (limited to 'src/rt/rust_chan.cpp')
| -rw-r--r-- | src/rt/rust_chan.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/rt/rust_chan.cpp b/src/rt/rust_chan.cpp index bf75c89057b..778fb6b16fd 100644 --- a/src/rt/rust_chan.cpp +++ b/src/rt/rust_chan.cpp @@ -22,7 +22,7 @@ rust_chan::rust_chan(rust_task *task, rust_chan::~rust_chan() { LOG(task, comm, "del rust_chan(task=0x%" PRIxPTR ")", (uintptr_t) this); - A(task->dom, is_associated() == false, + A(task->sched, is_associated() == false, "Channel must be disassociated before being freed."); --task->ref_count; } @@ -49,7 +49,7 @@ bool rust_chan::is_associated() { * Unlink this channel from its associated port. */ void rust_chan::disassociate() { - A(task->dom, is_associated(), "Channel must be associated with a port."); + A(task->sched, is_associated(), "Channel must be associated with a port."); if (port->is_proxy() == false) { LOG(task, task, @@ -69,14 +69,14 @@ void rust_chan::disassociate() { void rust_chan::send(void *sptr) { buffer.enqueue(sptr); - rust_dom *dom = task->dom; + rust_scheduler *sched = task->sched; if (!is_associated()) { - W(dom, is_associated(), + W(sched, is_associated(), "rust_chan::transmit with no associated port."); return; } - A(dom, !buffer.is_empty(), + A(sched, !buffer.is_empty(), "rust_chan::transmit with nothing to send."); if (port->is_proxy()) { @@ -86,7 +86,7 @@ void rust_chan::send(void *sptr) { } else { rust_port *target_port = port->referent(); if (target_port->task->blocked_on(target_port)) { - DLOG(dom, comm, "dequeued in rendezvous_ptr"); + DLOG(sched, comm, "dequeued in rendezvous_ptr"); buffer.dequeue(target_port->task->rendezvous_ptr); target_port->task->rendezvous_ptr = 0; target_port->task->wakeup(target_port); |
