X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/cd09951e5ca2fce63b0a1d7f61cf6ec4389ba4be..47950eebfede4e41862022469d15e5e4fe19c7ba:/src/kernel/activity/SleepImpl.cpp

diff --git a/src/kernel/activity/SleepImpl.cpp b/src/kernel/activity/SleepImpl.cpp
index 055d596560..8a3eb18588 100644
--- a/src/kernel/activity/SleepImpl.cpp
+++ b/src/kernel/activity/SleepImpl.cpp
@@ -42,12 +42,13 @@ void SleepImpl::post()
 {
   if (surf_action_->get_state() == resource::Action::State::FAILED) {
     if (host_ && not host_->is_on())
-      state_ = SIMIX_SRC_HOST_FAILURE;
+      state_ = State::SRC_HOST_FAILURE;
     else
-      state_ = SIMIX_CANCELED;
+      state_ = State::CANCELED;
   } else if (surf_action_->get_state() == resource::Action::State::FINISHED) {
-    state_ = SIMIX_DONE;
+    state_ = State::DONE;
   }
+  /* Answer all simcalls associated with the synchro */
   finish();
 }
 
@@ -57,14 +58,13 @@ void SleepImpl::finish()
     smx_simcall_t simcall = simcalls_.front();
     simcalls_.pop_front();
 
-    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();
     } else {
-      SIMIX_simcall_answer(simcall);
+      simcall->issuer_->simcall_answer();
     }
   }