merge SIMIX_synchro_finish into RawImpl::post

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

diff --git a/src/kernel/activity/SynchroRaw.cpp b/src/kernel/activity/SynchroRaw.cpp
index 8023822..9326bd2 100644 (file)
--- a/src/kernel/activity/SynchroRaw.cpp
+++ b/src/kernel/activity/SynchroRaw.cpp
@@ -5,6 +5,7 @@
 
 #include "src/kernel/activity/SynchroRaw.hpp"
 #include "simgrid/kernel/resource/Action.hpp"
+#include "src/kernel/context/Context.hpp"
 #include "src/simix/smx_synchro_private.hpp"
 #include "src/surf/surf_interface.hpp"
 
@@ -30,12 +31,19 @@ void RawImpl::resume()
 void RawImpl::post()
 {
   XBT_IN("(%p)",this);
-  if (surf_action_->get_state() == resource::Action::State::FAILED)
+  smx_simcall_t simcall = simcalls_.front();
+  simcalls_.pop_front();
+
+  SIMIX_synchro_stop_waiting(simcall->issuer, simcall);
+  simcall->issuer->waiting_synchro = nullptr;
+
+  if (surf_action_->get_state() == resource::Action::State::FAILED) {
     state_ = SIMIX_FAILED;
-  else if (surf_action_->get_state() == resource::Action::State::FINISHED)
+    simcall->issuer->context_->iwannadie = true;
+  } else if (surf_action_->get_state() == resource::Action::State::FINISHED) {
     state_ = SIMIX_SRC_TIMEOUT;
-
-  SIMIX_synchro_finish(this);
+    SIMIX_simcall_answer(simcall);
+  }
   XBT_OUT();
 }
 } // namespace activity