Commit deeabd7e authored by Dominik Charousset's avatar Dominik Charousset

Improve logging output

parent e26c0f58
...@@ -738,7 +738,9 @@ public: ...@@ -738,7 +738,9 @@ public:
upstream_msg::ack_open& x); upstream_msg::ack_open& x);
template <class T> template <class T>
void handle_upstream_msg(stream_slots slots, actor_addr&, T& x) { void handle_upstream_msg(stream_slots slots, actor_addr& sender, T& x) {
CAF_LOG_TRACE(CAF_ARG(slots) << CAF_ARG(sender) << CAF_ARG(x));
CAF_IGNORE_UNUSED(sender);
auto i = stream_managers_.find(slots.receiver); auto i = stream_managers_.find(slots.receiver);
if (i == stream_managers_.end()) { if (i == stream_managers_.end()) {
auto j = pending_stream_managers_.find(slots.receiver); auto j = pending_stream_managers_.find(slots.receiver);
......
...@@ -69,6 +69,8 @@ public: ...@@ -69,6 +69,8 @@ public:
} }
void initialize() override { void initialize() override {
CAF_LOG_TRACE("");
super::initialize();
this->setf(abstract_actor::is_initialized_flag); this->setf(abstract_actor::is_initialized_flag);
auto bhvr = make_behavior(); auto bhvr = make_behavior();
CAF_LOG_DEBUG_IF(!bhvr, "make_behavior() did not return a behavior:" CAF_LOG_DEBUG_IF(!bhvr, "make_behavior() did not return a behavior:"
...@@ -78,7 +80,6 @@ public: ...@@ -78,7 +80,6 @@ public:
CAF_LOG_DEBUG("make_behavior() did return a valid behavior"); CAF_LOG_DEBUG("make_behavior() did return a valid behavior");
this->do_become(std::move(bhvr.unbox()), true); this->do_become(std::move(bhvr.unbox()), true);
} }
super::initialize();
} }
protected: protected:
......
...@@ -84,6 +84,7 @@ const char* blocking_actor::name() const { ...@@ -84,6 +84,7 @@ const char* blocking_actor::name() const {
} }
void blocking_actor::launch(execution_unit*, bool, bool hide) { void blocking_actor::launch(execution_unit*, bool, bool hide) {
CAF_PUSH_AID_FROM_PTR(this);
CAF_LOG_TRACE(CAF_ARG(hide)); CAF_LOG_TRACE(CAF_ARG(hide));
CAF_ASSERT(getf(is_blocking_flag)); CAF_ASSERT(getf(is_blocking_flag));
if (!hide) if (!hide)
......
...@@ -32,7 +32,9 @@ event_based_actor::~event_based_actor() { ...@@ -32,7 +32,9 @@ event_based_actor::~event_based_actor() {
} }
void event_based_actor::initialize() { void event_based_actor::initialize() {
CAF_LOG_TRACE("subtype =" << detail::pretty_type_name(typeid(*this)).c_str()); CAF_LOG_TRACE(CAF_ARG2("subtype",
detail::pretty_type_name(typeid(*this)).c_str()));
extended_base::initialize();
setf(is_initialized_flag); setf(is_initialized_flag);
auto bhvr = make_behavior(); auto bhvr = make_behavior();
CAF_LOG_DEBUG_IF(!bhvr, "make_behavior() did not return a behavior:" CAF_LOG_DEBUG_IF(!bhvr, "make_behavior() did not return a behavior:"
...@@ -42,7 +44,6 @@ void event_based_actor::initialize() { ...@@ -42,7 +44,6 @@ void event_based_actor::initialize() {
CAF_LOG_DEBUG("make_behavior() did return a valid behavior"); CAF_LOG_DEBUG("make_behavior() did return a valid behavior");
become(std::move(bhvr)); become(std::move(bhvr));
} }
extended_base::initialize();
} }
behavior event_based_actor::make_behavior() { behavior event_based_actor::make_behavior() {
......
...@@ -112,7 +112,7 @@ error local_actor::load_state(deserializer&, const unsigned int) { ...@@ -112,7 +112,7 @@ error local_actor::load_state(deserializer&, const unsigned int) {
} }
void local_actor::initialize() { void local_actor::initialize() {
// nop CAF_LOG_TRACE(CAF_ARG2("id", id()) << CAF_ARG2("name", name()));
} }
bool local_actor::cleanup(error&& fail_state, execution_unit* host) { bool local_actor::cleanup(error&& fail_state, execution_unit* host) {
......
...@@ -178,6 +178,7 @@ const char* scheduled_actor::name() const { ...@@ -178,6 +178,7 @@ const char* scheduled_actor::name() const {
} }
void scheduled_actor::launch(execution_unit* eu, bool lazy, bool hide) { void scheduled_actor::launch(execution_unit* eu, bool lazy, bool hide) {
CAF_PUSH_AID_FROM_PTR(this);
CAF_LOG_TRACE(CAF_ARG(lazy) << CAF_ARG(hide)); CAF_LOG_TRACE(CAF_ARG(lazy) << CAF_ARG(hide));
CAF_ASSERT(!getf(is_blocking_flag)); CAF_ASSERT(!getf(is_blocking_flag));
if (!hide) if (!hide)
......
...@@ -42,6 +42,7 @@ public: ...@@ -42,6 +42,7 @@ public:
} }
void launch(execution_unit*, bool, bool hide) override { void launch(execution_unit*, bool, bool hide) override {
CAF_PUSH_AID_FROM_PTR(this);
CAF_LOG_TRACE(CAF_ARG(hide)); CAF_LOG_TRACE(CAF_ARG(hide));
CAF_ASSERT(getf(is_blocking_flag)); CAF_ASSERT(getf(is_blocking_flag));
if (!hide) if (!hide)
......
...@@ -46,6 +46,7 @@ void abstract_broker::enqueue(mailbox_element_ptr ptr, execution_unit*) { ...@@ -46,6 +46,7 @@ void abstract_broker::enqueue(mailbox_element_ptr ptr, execution_unit*) {
} }
void abstract_broker::launch(execution_unit* eu, bool lazy, bool hide) { void abstract_broker::launch(execution_unit* eu, bool lazy, bool hide) {
CAF_PUSH_AID_FROM_PTR(this);
CAF_ASSERT(eu != nullptr); CAF_ASSERT(eu != nullptr);
CAF_ASSERT(eu == &backend()); CAF_ASSERT(eu == &backend());
CAF_LOG_TRACE(CAF_ARG(lazy) << CAF_ARG(hide)); CAF_LOG_TRACE(CAF_ARG(lazy) << CAF_ARG(hide));
......
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