X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4485d715fa3a090c1dd38def83ab8239feebecb3..80778e856b09b86fba1663275ffc8bc320dea9ce:/src/kernel/activity/SleepImpl.cpp

diff --git a/src/kernel/activity/SleepImpl.cpp b/src/kernel/activity/SleepImpl.cpp
index f666d03dcf..a7c1cea468 100644
--- a/src/kernel/activity/SleepImpl.cpp
+++ b/src/kernel/activity/SleepImpl.cpp
@@ -1,86 +1,76 @@
-/* Copyright (c) 2007-2019. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2007-2022. 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/kernel/resource/CpuImpl.hpp"
 
-#include "simgrid/Exception.hpp"
-#include "src/simix/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(ker_actor);
 
-XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_process);
 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_->get_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())
+      set_state(State::SRC_HOST_FAILURE);
+    else
+      set_state(State::CANCELED);
+  } else if (surf_action_->get_state() == resource::Action::State::FINISHED) {
+    set_state(State::DONE);
+  }
+
+  clean_action();
+  /* Answer all simcalls associated with the synchro */
+  finish();
+}
+void SleepImpl::set_exception(actor::ActorImpl* issuer)
+{
+  /* FIXME: Really, nothing bad can happen while we sleep? */
+}
+void SleepImpl::finish()
+{
+  XBT_DEBUG("SleepImpl::finish() in state %s", get_state_str());
   while (not simcalls_.empty()) {
-    smx_simcall_t simcall = simcalls_.front();
+    const s_smx_simcall* simcall = simcalls_.front();
     simcalls_.pop_front();
-    e_smx_state_t result;
-    if (host_ && not host_->is_on()) {
-      /* 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->host_->is_on()) {
-      simcall->issuer->context_->iwannadie = true;
-    }
-    simcall_process_sleep__set__result(simcall, result);
-    simcall->issuer->waiting_synchro = nullptr;
-    if (simcall->issuer->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();
     }
   }
-
-  SIMIX_process_sleep_destroy(this);
 }
-
 } // namespace activity
 } // namespace kernel
 } // namespace simgrid