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

diff --git a/src/kernel/activity/SleepImpl.cpp b/src/kernel/activity/SleepImpl.cpp
index ec7d083def..b5b7a7ab6d 100644
--- a/src/kernel/activity/SleepImpl.cpp
+++ b/src/kernel/activity/SleepImpl.cpp
@@ -1,64 +1,81 @@
-/* Copyright (c) 2007-2017. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2007-2019. 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 "simgrid/kernel/resource/Action.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/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(simix_process);
+namespace simgrid {
+namespace kernel {
+namespace activity {
 
-void simgrid::kernel::activity::SleepImpl::suspend()
+SleepImpl& SleepImpl::set_host(s4u::Host* host)
 {
-  surf_sleep->suspend();
+  host_ = host;
+  return *this;
 }
 
-void simgrid::kernel::activity::SleepImpl::resume()
+SleepImpl& SleepImpl::set_duration(double duration)
 {
-  surf_sleep->resume();
+  duration_ = duration;
+  return *this;
 }
 
-void simgrid::kernel::activity::SleepImpl::post()
+SleepImpl* SleepImpl::start()
 {
-  while (not simcalls.empty()) {
-    smx_simcall_t simcall = simcalls.front();
-    simcalls.pop_front();
-
-    e_smx_state_t result;
-    switch (surf_sleep->getState()) {
-      case simgrid::kernel::resource::Action::State::failed:
-        simcall->issuer->context->iwannadie = 1;
-        result                              = SIMIX_SRC_HOST_FAILURE;
-        break;
+  surf_action_ = host_->pimpl_cpu->sleep(duration_);
+  surf_action_->set_activity(this);
+  XBT_DEBUG("Create sleep synchronization %p", this);
+  return this;
+}
 
-      case simgrid::kernel::resource::Action::State::done:
-        result = SIMIX_DONE;
-        break;
+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();
+}
 
-      default:
-        THROW_IMPOSSIBLE;
-        break;
-    }
-    if (simcall->issuer->host->isOff()) {
-      simcall->issuer->context->iwannadie = 1;
+void SleepImpl::finish()
+{
+  while (not simcalls_.empty()) {
+    smx_simcall_t simcall = simcalls_.front();
+    simcalls_.pop_front();
+    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 */
+      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->suspended) {
+    if (simcall->issuer->is_suspended()) {
       XBT_DEBUG("Wait! This process is suspended and can't wake up now.");
-      simcall->issuer->suspended = 0;
+      simcall->issuer->suspended_ = false;
       simcall_HANDLER_process_suspend(simcall, simcall->issuer);
     } else {
       SIMIX_simcall_answer(simcall);
     }
   }
 
-  SIMIX_process_sleep_destroy(this);
+  clean_action();
 }
+} // namespace activity
+} // namespace kernel
+} // namespace simgrid