From 9a7576fe2cdd169313b5e25be6bf485407adb496 Mon Sep 17 00:00:00 2001 From: Marijn Haverbeke Date: Thu, 7 Apr 2011 22:05:45 +0200 Subject: Move to macro-based logging checks in the C++ code No functions should be called for log statements that turn out to be inactive. --- src/rt/rust_port.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/rt/rust_port.cpp') diff --git a/src/rt/rust_port.cpp b/src/rt/rust_port.cpp index 82054687..178b46a7 100644 --- a/src/rt/rust_port.cpp +++ b/src/rt/rust_port.cpp @@ -5,7 +5,7 @@ rust_port::rust_port(rust_task *task, size_t unit_sz) : maybe_proxy(this), task(task), unit_sz(unit_sz), writers(task->dom), chans(task->dom) { - task->log(rust_log::MEM | rust_log::COMM, + LOG(task, rust_log::MEM | rust_log::COMM, "new rust_port(task=0x%" PRIxPTR ", unit_sz=%d) -> port=0x%" PRIxPTR, (uintptr_t)task, unit_sz, (uintptr_t)this); @@ -14,10 +14,10 @@ rust_port::rust_port(rust_task *task, size_t unit_sz) : } rust_port::~rust_port() { - task->log(rust_log::COMM | rust_log::MEM, + LOG(task, rust_log::COMM | rust_log::MEM, "~rust_port 0x%" PRIxPTR, (uintptr_t) this); - log_state(); + // log_state(); // Disassociate channels from this port. while (chans.is_empty() == false) { @@ -25,7 +25,7 @@ rust_port::~rust_port() { chan->disassociate(); if (chan->ref_count == 0) { - task->log(rust_log::COMM, + LOG(task, rust_log::COMM, "chan: 0x%" PRIxPTR " is dormant, freeing", chan); delete chan; } @@ -39,7 +39,7 @@ bool rust_port::receive(void *dptr) { rust_chan *chan = chans[i]; if (chan->buffer.is_empty() == false) { chan->buffer.dequeue(dptr); - task->log(rust_log::COMM, "<=== read data ==="); + LOG(task, rust_log::COMM, "<=== read data ==="); return true; } } @@ -47,12 +47,12 @@ bool rust_port::receive(void *dptr) { } void rust_port::log_state() { - task->log(rust_log::COMM, + LOG(task, rust_log::COMM, "rust_port: 0x%" PRIxPTR ", associated channel(s): %d", this, chans.length()); for (uint32_t i = 0; i < chans.length(); i++) { rust_chan *chan = chans[i]; - task->log(rust_log::COMM, + LOG(task, rust_log::COMM, "\tchan: 0x%" PRIxPTR ", size: %d, remote: %s", chan, chan->buffer.size(), -- cgit v1.2.3