From cd09951e5ca2fce63b0a1d7f61cf6ec4389ba4be Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Fri, 14 Jun 2019 15:15:58 +0200 Subject: [PATCH] kill dead code --- examples/s4u/platform-failures/s4u-platform-failures.cpp | 7 ++++--- src/kernel/activity/SleepImpl.cpp | 6 ------ 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/examples/s4u/platform-failures/s4u-platform-failures.cpp b/examples/s4u/platform-failures/s4u-platform-failures.cpp index ceea3140f7..adc1f01044 100644 --- a/examples/s4u/platform-failures/s4u-platform-failures.cpp +++ b/examples/s4u/platform-failures/s4u-platform-failures.cpp @@ -9,9 +9,10 @@ * To set such a profile, the first way is to use a file in the XML, while the second is to use the programmatic * interface. Once this profile is in place, the resource will automatically be turned on and off. * - * The actors running on an host that is turned off will receive a simgrid::HostFailureException. Since we specified - * on_failure="RESTART" for each actors in the XML file, they will be automatically restarted when the host starts - * again. + * The actors running on an host that is turned off are forcefully killed + * once their on_exit callbacks are executed. They cannot avoid this fate. + * Since we specified on_failure="RESTART" for each actors in the XML file, + * they will be automatically restarted when the host starts again. * * Communications using failed links will .. fail. */ diff --git a/src/kernel/activity/SleepImpl.cpp b/src/kernel/activity/SleepImpl.cpp index b5b7a7ab6d..055d596560 100644 --- a/src/kernel/activity/SleepImpl.cpp +++ b/src/kernel/activity/SleepImpl.cpp @@ -56,12 +56,6 @@ void SleepImpl::finish() while (not simcalls_.empty()) { smx_simcall_t simcall = simcalls_.front(); simcalls_.pop_front(); - if (state_ == SIMIX_SRC_HOST_FAILURE) { - /* If the host running the synchro failed, notice it. This way, the asking - * actor can be killed if it runs on that host itself */ - simcall->issuer->context_->iwannadie = true; - simcall->issuer->exception_ = std::make_exception_ptr(HostFailureException(XBT_THROW_POINT, "Host failed")); - } simcall_process_sleep__set__result(simcall, state_); simcall->issuer->waiting_synchro = nullptr; -- 2.20.1