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

diff --git a/src/kernel/activity/SleepImpl.cpp b/src/kernel/activity/SleepImpl.cpp
index edabd248fa..b5b7a7ab6d 100644
--- a/src/kernel/activity/SleepImpl.cpp
+++ b/src/kernel/activity/SleepImpl.cpp
@@ -8,7 +8,6 @@
 #include "simgrid/kernel/resource/Action.hpp"
 #include "simgrid/s4u/Host.hpp"
 #include "src/kernel/context/Context.hpp"
-#include "src/simix/ActorImpl.hpp"
 #include "src/simix/popping_private.hpp"
 #include "src/simix/smx_private.hpp"
 #include "src/surf/cpu_interface.hpp"
@@ -19,53 +18,52 @@ namespace simgrid {
 namespace kernel {
 namespace activity {
 
-SleepImpl::~SleepImpl()
+SleepImpl& SleepImpl::set_host(s4u::Host* host)
 {
-  if (surf_action_)
-    surf_action_->unref();
-  XBT_DEBUG("Destroy activity %p", this);
+  host_ = host;
+  return *this;
 }
 
-SleepImpl* SleepImpl::start(double duration)
+SleepImpl& SleepImpl::set_duration(double duration)
 {
-  surf_action_ = host_->pimpl_cpu->sleep(duration);
-  surf_action_->set_data(this);
+  duration_ = duration;
+  return *this;
+}
+
+SleepImpl* SleepImpl::start()
+{
+  surf_action_ = host_->pimpl_cpu->sleep(duration_);
+  surf_action_->set_activity(this);
   XBT_DEBUG("Create sleep synchronization %p", this);
   return this;
 }
 
 void SleepImpl::post()
+{
+  if (surf_action_->get_state() == resource::Action::State::FAILED) {
+    if (host_ && not host_->is_on())
+      state_ = SIMIX_SRC_HOST_FAILURE;
+    else
+      state_ = SIMIX_CANCELED;
+  } else if (surf_action_->get_state() == resource::Action::State::FINISHED) {
+    state_ = SIMIX_DONE;
+  }
+  finish();
+}
+
+void SleepImpl::finish()
 {
   while (not simcalls_.empty()) {
     smx_simcall_t simcall = simcalls_.front();
     simcalls_.pop_front();
-    e_smx_state_t result;
-    if (host_ && not host_->is_on()) {
+    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 */
-      result = SIMIX_SRC_HOST_FAILURE;
-      simcall->issuer->throw_exception(
-          std::make_exception_ptr(simgrid::HostFailureException(XBT_THROW_POINT, "Host failed")));
-    }
-
-    switch (surf_action_->get_state()) {
-      case resource::Action::State::FAILED:
-        simcall->issuer->context_->iwannadie = true;
-        result                               = SIMIX_FAILED;
-        break;
-
-      case resource::Action::State::FINISHED:
-        result = SIMIX_DONE;
-        break;
-
-      default:
-        THROW_IMPOSSIBLE;
-        break;
-    }
-    if (not simcall->issuer->get_host()->is_on()) {
       simcall->issuer->context_->iwannadie = true;
+      simcall->issuer->exception_ = std::make_exception_ptr(HostFailureException(XBT_THROW_POINT, "Host failed"));
     }
-    simcall_process_sleep__set__result(simcall, result);
+
+    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.");
@@ -76,11 +74,7 @@ void SleepImpl::post()
     }
   }
 
-  SIMIX_process_sleep_destroy(this);
-}
-void SleepImpl::finish()
-{
-  /* FIXME some part of post should move to finish */
+  clean_action();
 }
 } // namespace activity
 } // namespace kernel