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

diff --git a/src/kernel/activity/SleepImpl.cpp b/src/kernel/activity/SleepImpl.cpp
index 055d596560..cec6de2d26 100644
--- a/src/kernel/activity/SleepImpl.cpp
+++ b/src/kernel/activity/SleepImpl.cpp
@@ -1,17 +1,14 @@
-/* Copyright (c) 2007-2019. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2007-2021. The SimGrid Team. All rights reserved.          */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
+#include <simgrid/s4u/Host.hpp>
+
 #include "src/kernel/activity/SleepImpl.hpp"
-#include "simgrid/Exception.hpp"
-#include "simgrid/kernel/resource/Action.hpp"
-#include "simgrid/s4u/Host.hpp"
-#include "src/kernel/context/Context.hpp"
+#include "src/kernel/actor/ActorImpl.hpp"
 #include "src/simix/popping_private.hpp"
-#include "src/simix/smx_private.hpp"
 #include "src/surf/cpu_interface.hpp"
-#include "src/surf/surf_interface.hpp"
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_process);
 namespace simgrid {
@@ -32,7 +29,7 @@ SleepImpl& SleepImpl::set_duration(double duration)
 
 SleepImpl* SleepImpl::start()
 {
-  surf_action_ = host_->pimpl_cpu->sleep(duration_);
+  surf_action_ = host_->get_cpu()->sleep(duration_);
   surf_action_->set_activity(this);
   XBT_DEBUG("Create sleep synchronization %p", this);
   return this;
@@ -42,33 +39,34 @@ 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;
   }
+
+  clean_action();
+  /* Answer all simcalls associated with the synchro */
   finish();
 }
 
 void SleepImpl::finish()
 {
+  XBT_DEBUG("SleepImpl::finish() in state %s", to_c_str(state_));
   while (not simcalls_.empty()) {
-    smx_simcall_t simcall = simcalls_.front();
+    const s_smx_simcall* simcall = simcalls_.front();
     simcalls_.pop_front();
 
-    simcall_process_sleep__set__result(simcall, state_);
-    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_->waiting_synchro_ = nullptr;
+    if (simcall->issuer_->is_suspended()) {
+      XBT_DEBUG("Wait! This actor is suspended and can't wake up now.");
+      simcall->issuer_->suspended_ = false;
+      simcall->issuer_->suspend();
     } else {
-      SIMIX_simcall_answer(simcall);
+      simcall->issuer_->simcall_answer();
     }
   }
-
-  clean_action();
 }
 } // namespace activity
 } // namespace kernel