handle SleepImpl more like other activities

[simgrid.git] / src / kernel / activity / SleepImpl.cpp

diff --git a/src/kernel/activity/SleepImpl.cpp b/src/kernel/activity/SleepImpl.cpp
index 7b8f3d5..ea0fe2d 100644 (file)
--- a/src/kernel/activity/SleepImpl.cpp
+++ b/src/kernel/activity/SleepImpl.cpp
@@ -1,58 +1,77 @@
-/* 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 "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 "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(simix_process);
+namespace simgrid {
+namespace kernel {
+namespace activity {
 
-void simgrid::kernel::activity::SleepImpl::suspend()
+SleepImpl::~SleepImpl()
 {
-  surf_sleep->suspend();
+  if (surf_action_)
+    surf_action_->unref();
+  XBT_DEBUG("Destroy activity %p", this);
 }
 
-void simgrid::kernel::activity::SleepImpl::resume()
+SleepImpl* SleepImpl::start(double duration)
 {
-  surf_sleep->resume();
+  surf_action_ = host_->pimpl_cpu->sleep(duration);
+  surf_action_->set_data(this);
+  XBT_DEBUG("Create sleep synchronization %p", this);
+  return this;
 }
 
-void simgrid::kernel::activity::SleepImpl::post()
+void SleepImpl::post()
 {
-  while (not simcalls.empty()) {
-    smx_simcall_t simcall = simcalls.front();
-    simcalls.pop_front();
-
-    e_smx_state_t state;
-    switch (surf_sleep->getState()) {
-      case simgrid::surf::Action::State::failed:
-        simcall->issuer->context->iwannadie = 1;
-        state = SIMIX_SRC_HOST_FAILURE;
+  while (not simcalls_.empty()) {
+    smx_simcall_t simcall = simcalls_.front();
+    simcalls_.pop_front();
+    e_smx_state_t result;
+    if (host_ && host_->is_off()) {
+      /* 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 simgrid::surf::Action::State::done:
-        state = SIMIX_DONE;
+      case resource::Action::State::FINISHED:
+        result = SIMIX_DONE;
         break;
 
       default:
         THROW_IMPOSSIBLE;
         break;
     }
-    if (simcall->issuer->host->isOff()) {
-      simcall->issuer->context->iwannadie = 1;
+    if (simcall->issuer->host_->is_off()) {
+      simcall->issuer->context_->iwannadie = true;
     }
-    simcall_process_sleep__set__result(simcall, state);
+    simcall_process_sleep__set__result(simcall, result);
     simcall->issuer->waiting_synchro = nullptr;
-    if (simcall->issuer->suspended) {
+    if (simcall->issuer->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);
@@ -61,3 +80,7 @@ void simgrid::kernel::activity::SleepImpl::post()
 
   SIMIX_process_sleep_destroy(this);
 }
+
+} // namespace activity
+} // namespace kernel
+} // namespace simgrid