From 4af471314616b22368e7bccfb17252bfb24efc25 Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Tue, 19 Feb 2019 21:00:28 +0100 Subject: [PATCH 1/1] Cosmetics: adjust method names in debug messages. --- src/kernel/activity/ExecImpl.cpp | 10 +++++----- src/kernel/activity/IoImpl.cpp | 2 +- src/kernel/activity/SynchroRaw.cpp | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/kernel/activity/ExecImpl.cpp b/src/kernel/activity/ExecImpl.cpp index ba2413b0b9..0969448e0c 100644 --- a/src/kernel/activity/ExecImpl.cpp +++ b/src/kernel/activity/ExecImpl.cpp @@ -162,29 +162,29 @@ void ExecImpl::finish() case SIMIX_DONE: /* do nothing, synchro done */ - XBT_DEBUG("SIMIX_execution_finished: execution successful"); + XBT_DEBUG("ExecImpl::finish(): execution successful"); break; case SIMIX_FAILED: - XBT_DEBUG("SIMIX_execution_finished: host '%s' failed", simcall->issuer->get_host()->get_cname()); + XBT_DEBUG("ExecImpl::finish(): host '%s' failed", simcall->issuer->get_host()->get_cname()); simcall->issuer->context_->iwannadie = true; simcall->issuer->exception_ = std::make_exception_ptr(simgrid::HostFailureException(XBT_THROW_POINT, "Host failed")); break; case SIMIX_CANCELED: - XBT_DEBUG("SIMIX_execution_finished: execution canceled"); + XBT_DEBUG("ExecImpl::finish(): execution canceled"); simcall->issuer->exception_ = std::make_exception_ptr(simgrid::CancelException(XBT_THROW_POINT, "Execution Canceled")); break; case SIMIX_TIMEOUT: - XBT_DEBUG("SIMIX_execution_finished: execution timeouted"); + XBT_DEBUG("ExecImpl::finish(): execution timeouted"); simcall->issuer->exception_ = std::make_exception_ptr(simgrid::TimeoutError(XBT_THROW_POINT, "Timeouted")); break; default: - xbt_die("Internal error in SIMIX_execution_finish: unexpected synchro state %d", static_cast(state_)); + xbt_die("Internal error in ExecImpl::finish(): unexpected synchro state %d", static_cast(state_)); } simcall->issuer->waiting_synchro = nullptr; diff --git a/src/kernel/activity/IoImpl.cpp b/src/kernel/activity/IoImpl.cpp index b96036d15e..7597010364 100644 --- a/src/kernel/activity/IoImpl.cpp +++ b/src/kernel/activity/IoImpl.cpp @@ -110,7 +110,7 @@ void IoImpl::finish() std::make_exception_ptr(simgrid::CancelException(XBT_THROW_POINT, "I/O Canceled")); break; default: - xbt_die("Internal error in SIMIX_io_finish: unexpected synchro state %d", static_cast(state_)); + xbt_die("Internal error in IoImpl::finish(): unexpected synchro state %d", static_cast(state_)); } simcall->issuer->waiting_synchro = nullptr; diff --git a/src/kernel/activity/SynchroRaw.cpp b/src/kernel/activity/SynchroRaw.cpp index 42133c2427..8961561fc2 100644 --- a/src/kernel/activity/SynchroRaw.cpp +++ b/src/kernel/activity/SynchroRaw.cpp @@ -60,11 +60,11 @@ void RawImpl::finish() switch (state_) { case SIMIX_DONE: /* do nothing, synchro done */ - XBT_DEBUG("SIMIX_execution_finished: execution successful"); + XBT_DEBUG("RawImpl::finish(): execution successful"); break; case SIMIX_FAILED: - XBT_DEBUG("SIMIX_execution_finished: host '%s' failed", simcall->issuer->get_host()->get_cname()); + XBT_DEBUG("RawImpl::finish(): host '%s' failed", simcall->issuer->get_host()->get_cname()); simcall->issuer->context_->iwannadie = true; simcall->issuer->exception_ = std::make_exception_ptr(simgrid::HostFailureException(XBT_THROW_POINT, "Host failed")); -- 2.20.1