diff options
| author | Graydon Hoare <graydon@mozilla.com> | 2011-07-13 15:44:09 -0700 |
|---|---|---|
| committer | Graydon Hoare <graydon@mozilla.com> | 2011-07-13 15:44:09 -0700 |
| commit | 39151f2ad8d18554af1d6787bae0b02345e1d90b (patch) | |
| tree | c10c032214af521351cd46d6ee23a5007927bc48 /src/rt/rust_upcall.cpp | |
| parent | 04b239f3cb9d4b62488dc2d219e9bd9a242bdf8f (diff) | |
| download | rust-39151f2ad8d18554af1d6787bae0b02345e1d90b.tar.gz rust-39151f2ad8d18554af1d6787bae0b02345e1d90b.zip | |
Prohibit trailing whitespace under 'tidy' script. Clean up all caught cases.
Diffstat (limited to 'src/rt/rust_upcall.cpp')
| -rw-r--r-- | src/rt/rust_upcall.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/rt/rust_upcall.cpp b/src/rt/rust_upcall.cpp index 1cf2e935e1a..16d7f7c4f83 100644 --- a/src/rt/rust_upcall.cpp +++ b/src/rt/rust_upcall.cpp @@ -192,20 +192,20 @@ upcall_recv(rust_task *task, uintptr_t *dptr, rust_port *port) { { scoped_lock with(port->lock); LOG_UPCALL_ENTRY(task); - + LOG(task, comm, "port: 0x%" PRIxPTR ", dptr: 0x%" PRIxPTR ", size: 0x%" PRIxPTR ", chan_no: %d", (uintptr_t) port, (uintptr_t) dptr, port->unit_sz, port->chans.length()); - + if (port->receive(dptr)) { return; } - + // No data was buffered on any incoming channel, so block this task on // the port. Remember the rendezvous location so that any sender task // can write to it before waking up this task. - + LOG(task, comm, "<=== waiting for rendezvous data ==="); task->rendezvous_ptr = dptr; task->block(port, "waiting for rendezvous data"); @@ -351,7 +351,6 @@ rust_str *make_str(rust_task *task, char const *s, size_t fill) { extern "C" CDECL rust_str * upcall_new_str(rust_task *task, char const *s, size_t fill) { LOG_UPCALL_ENTRY(task); - return make_str(task, s, fill); } @@ -537,7 +536,7 @@ upcall_start_task(rust_task *spawner, rust_scheduler *sched = spawner->sched; DLOG(sched, task, "upcall start_task(task %s @0x%" PRIxPTR - ", spawnee 0x%" PRIxPTR ")", + ", spawnee 0x%" PRIxPTR ")", task->name, task, spawnee_fn); |
