From b6e74c9611f84ac904a3658026cafab614c7d081 Mon Sep 17 00:00:00 2001 From: Frederic Suter Date: Tue, 2 Apr 2019 17:38:28 +0200 Subject: [PATCH] DONE is not an expected state for Raw activities --- src/kernel/activity/SynchroRaw.cpp | 26 ++++++++------------------ 1 file changed, 8 insertions(+), 18 deletions(-) diff --git a/src/kernel/activity/SynchroRaw.cpp b/src/kernel/activity/SynchroRaw.cpp index 8d8ede01ea..3b56ef8ff5 100644 --- a/src/kernel/activity/SynchroRaw.cpp +++ b/src/kernel/activity/SynchroRaw.cpp @@ -69,24 +69,14 @@ void RawImpl::finish() smx_simcall_t simcall = simcalls_.front(); simcalls_.pop_front(); - switch (state_) { - case SIMIX_DONE: - /* do nothing, synchro done */ - XBT_DEBUG("RawImpl::finish(): execution successful"); - break; - - case SIMIX_FAILED: - 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")); - break; - case SIMIX_SRC_TIMEOUT: - simcall->issuer->exception_ = - std::make_exception_ptr(simgrid::TimeoutError(XBT_THROW_POINT, "Synchronization timeout")); - break; - default: - xbt_die("Internal error in RawImpl::finish() unexpected synchro state %d", static_cast(state_)); + if (state_ == SIMIX_FAILED) { + 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(HostFailureException(XBT_THROW_POINT, "Host failed")); + } else if (state_ == SIMIX_SRC_TIMEOUT) { + simcall->issuer->exception_ = std::make_exception_ptr(TimeoutError(XBT_THROW_POINT, "Synchronization timeout")); + } else { + xbt_die("Internal error in RawImpl::finish() unexpected synchro state %d", static_cast(state_)); } switch (simcall->call) { -- 2.20.1