Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Install some kernel header files for the users' plugins and more
[simgrid.git] / src / kernel / activity / SleepImpl.cpp
index 6db6d88..ec7d083 100644 (file)
@@ -5,11 +5,12 @@
 
 #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.h"
+#include "src/simix/popping_private.hpp"
 #include "src/surf/surf_interface.hpp"
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_process);
@@ -30,16 +31,15 @@ void simgrid::kernel::activity::SleepImpl::post()
     smx_simcall_t simcall = simcalls.front();
     simcalls.pop_front();
 
-    e_smx_state_t state;
+    e_smx_state_t result;
     switch (surf_sleep->getState()) {
-      case simgrid::surf::Action::State::failed:
+      case simgrid::kernel::resource::Action::State::failed:
         simcall->issuer->context->iwannadie = 1;
-        // SMX_EXCEPTION(simcall->issuer, host_error, 0, "Host failed");
-        state = SIMIX_SRC_HOST_FAILURE;
+        result                              = SIMIX_SRC_HOST_FAILURE;
         break;
 
-      case simgrid::surf::Action::State::done:
-        state = SIMIX_DONE;
+      case simgrid::kernel::resource::Action::State::done:
+        result = SIMIX_DONE;
         break;
 
       default:
@@ -49,7 +49,7 @@ void simgrid::kernel::activity::SleepImpl::post()
     if (simcall->issuer->host->isOff()) {
       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) {
       XBT_DEBUG("Wait! This process is suspended and can't wake up now.");