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

diff --git a/src/kernel/activity/SleepImpl.cpp b/src/kernel/activity/SleepImpl.cpp
index 7b8f3d552f..b02cda83d0 100644
--- a/src/kernel/activity/SleepImpl.cpp
+++ b/src/kernel/activity/SleepImpl.cpp
@@ -1,16 +1,19 @@
-/* Copyright (c) 2007-2017. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2007-2018. 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 "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/surf_interface.hpp"
+#include "xbt/ex.hpp"
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_process);
 
@@ -26,33 +29,39 @@ void simgrid::kernel::activity::SleepImpl::resume()
 
 void simgrid::kernel::activity::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;
+      SMX_EXCEPTION(simcall->issuer, host_error, 0, "Host failed");
+    }
+
+    switch (surf_sleep->get_state()) {
+      case simgrid::kernel::resource::Action::State::FAILED:
+        simcall->issuer->context_->iwannadie = 1;
+        result                               = SIMIX_FAILED;
         break;
 
-      case simgrid::surf::Action::State::done:
-        state = SIMIX_DONE;
+      case simgrid::kernel::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 = 1;
     }
-    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_ = 0;
       simcall_HANDLER_process_suspend(simcall, simcall->issuer);
     } else {
       SIMIX_simcall_answer(simcall);