Commit c9cbffed authored by Dominik Charousset's avatar Dominik Charousset

fixed log statements

parent 5d3cf75b
...@@ -136,7 +136,7 @@ default_peer* default_protocol::get_peer(const process_information& n) { ...@@ -136,7 +136,7 @@ default_peer* default_protocol::get_peer(const process_information& n) {
CPPA_LOG_TRACE("n = " << to_string(n)); CPPA_LOG_TRACE("n = " << to_string(n));
auto i = m_peers.find(n); auto i = m_peers.find(n);
if (i != m_peers.end()) { if (i != m_peers.end()) {
CPPA_LOGMF(CPPA_DEBUG, self, "result = " << i->second.impl.get()); CPPA_LOG_DEBUG("result = " << i->second.impl);
return i->second.impl; return i->second.impl;
} }
CPPA_LOGMF(CPPA_DEBUG, self, "result = nullptr"); CPPA_LOGMF(CPPA_DEBUG, self, "result = nullptr");
...@@ -234,7 +234,7 @@ actor_ptr default_protocol::remote_actor(stream_ptr_pair io, ...@@ -234,7 +234,7 @@ actor_ptr default_protocol::remote_actor(stream_ptr_pair io,
void default_protocol::last_proxy_exited(default_peer* pptr) { void default_protocol::last_proxy_exited(default_peer* pptr) {
CPPA_REQUIRE(pptr != nullptr); CPPA_REQUIRE(pptr != nullptr);
CPPA_LOG_TRACE("pptr = " << pptr.get() CPPA_LOG_TRACE(CPPA_ARG(pptr)
<< ", pptr->node() = " << to_string(pptr->node())); << ", pptr->node() = " << to_string(pptr->node()));
if (pptr->erase_on_last_proxy_exited() && pptr->queue().empty()) { if (pptr->erase_on_last_proxy_exited() && pptr->queue().empty()) {
stop_reader(pptr); stop_reader(pptr);
...@@ -260,7 +260,7 @@ void default_protocol::new_peer(const input_stream_ptr& in, ...@@ -260,7 +260,7 @@ void default_protocol::new_peer(const input_stream_ptr& in,
} }
void default_protocol::continue_writer(default_peer* pptr) { void default_protocol::continue_writer(default_peer* pptr) {
CPPA_LOG_TRACE(CPPA_MARG(pptr, get)); CPPA_LOG_TRACE(CPPA_ARG(pptr));
super::continue_writer(pptr); super::continue_writer(pptr);
} }
......
...@@ -112,12 +112,12 @@ class middleman_impl { ...@@ -112,12 +112,12 @@ class middleman_impl {
} }
void continue_writer(continuable* ptr) { void continue_writer(continuable* ptr) {
CPPA_LOG_TRACE("ptr = " << ptr.get()); CPPA_LOG_TRACE(CPPA_ARG(ptr));
m_handler->add_later(ptr, event::write); m_handler->add_later(ptr, event::write);
} }
void stop_writer(continuable* ptr) { void stop_writer(continuable* ptr) {
CPPA_LOG_TRACE("ptr = " << ptr.get()); CPPA_LOG_TRACE(CPPA_ARG(ptr));
m_handler->erase_later(ptr, event::write); m_handler->erase_later(ptr, event::write);
} }
...@@ -126,12 +126,12 @@ class middleman_impl { ...@@ -126,12 +126,12 @@ class middleman_impl {
} }
void continue_reader(continuable* ptr) { void continue_reader(continuable* ptr) {
CPPA_LOG_TRACE("ptr = " << ptr.get()); CPPA_LOG_TRACE(CPPA_ARG(ptr));
m_handler->add_later(ptr, event::read); m_handler->add_later(ptr, event::read);
} }
void stop_reader(continuable* ptr) { void stop_reader(continuable* ptr) {
CPPA_LOG_TRACE("ptr = " << ptr.get()); CPPA_LOG_TRACE(CPPA_ARG(ptr));
m_handler->erase_later(ptr, event::read); m_handler->erase_later(ptr, event::read);
} }
......
...@@ -79,12 +79,12 @@ void middleman_event_handler::alteration(continuable* ptr, ...@@ -79,12 +79,12 @@ void middleman_event_handler::alteration(continuable* ptr,
} }
void middleman_event_handler::add_later(continuable* ptr, event_bitmask e) { void middleman_event_handler::add_later(continuable* ptr, event_bitmask e) {
CPPA_LOG_TRACE("ptr = " << ptr.get() << ", e = " << eb2str(e)); CPPA_LOG_TRACE(CPPA_ARG(ptr) << ", " << CPPA_TARG(e, eb2str));
alteration(ptr, e, fd_meta_event::add); alteration(ptr, e, fd_meta_event::add);
} }
void middleman_event_handler::erase_later(continuable* ptr, event_bitmask e) { void middleman_event_handler::erase_later(continuable* ptr, event_bitmask e) {
CPPA_LOG_TRACE("ptr = " << ptr.get() << ", e = " << eb2str(e)); CPPA_LOG_TRACE(CPPA_ARG(ptr) << ", e = " << eb2str(e));
alteration(ptr, e, fd_meta_event::erase); alteration(ptr, e, fd_meta_event::erase);
} }
...@@ -107,7 +107,7 @@ void middleman_event_handler::update() { ...@@ -107,7 +107,7 @@ void middleman_event_handler::update() {
auto mask = next_bitmask(old, elem.mask, elem_pair.second); auto mask = next_bitmask(old, elem.mask, elem_pair.second);
auto ptr = elem.ptr; auto ptr = elem.ptr;
CPPA_LOG_DEBUG("new bitmask for " CPPA_LOG_DEBUG("new bitmask for "
<< elem.ptr.get() << ": " << eb2str(mask)); << elem.ptr << ": " << eb2str(mask));
if (iter == last || iter->fd != elem.fd) { if (iter == last || iter->fd != elem.fd) {
CPPA_LOG_ERROR_IF(mask == event::none, CPPA_LOG_ERROR_IF(mask == event::none,
"cannot erase " << ptr << " (no such element)"); "cannot erase " << ptr << " (no such element)");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment