small simplifications around simcalls

[simgrid.git] / src / kernel / activity / SleepImpl.cpp

diff --git a/src/kernel/activity/SleepImpl.cpp b/src/kernel/activity/SleepImpl.cpp
index b5b7a7a..e20cdf7 100644 (file)
--- a/src/kernel/activity/SleepImpl.cpp
+++ b/src/kernel/activity/SleepImpl.cpp
@@ -48,6 +48,7 @@ void SleepImpl::post()
   } else if (surf_action_->get_state() == resource::Action::State::FINISHED) {
     state_ = SIMIX_DONE;
   }
+  /* Answer all simcalls associated with the synchro */
   finish();
 }
 
@@ -56,21 +57,14 @@ 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;
-    if (simcall->issuer->is_suspended()) {
+    simcall->issuer_->waiting_synchro = nullptr;
+    if (simcall->issuer_->is_suspended()) {
       XBT_DEBUG("Wait! This process is suspended and can't wake up now.");
-      simcall->issuer->suspended_ = false;
-      simcall_HANDLER_process_suspend(simcall, simcall->issuer);
+      simcall->issuer_->suspended_ = false;
+      simcall->issuer_->suspend(simcall->issuer_);
     } else {
-      SIMIX_simcall_answer(simcall);
+      simcall->issuer_->simcall_answer();
     }
   }