Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
enum class values should be UPPER_CASE
[simgrid.git] / src / kernel / activity / SleepImpl.cpp
index 7b8f3d5..aea4da1 100644 (file)
@@ -1,10 +1,11 @@
-/* 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"
 
@@ -26,29 +27,29 @@ 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();
+  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:
+    e_smx_state_t result;
+    switch (surf_sleep->get_state()) {
+      case simgrid::kernel::resource::Action::State::FAILED:
         simcall->issuer->context->iwannadie = 1;
-        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::FINISHED:
+        result = SIMIX_DONE;
         break;
 
       default:
         THROW_IMPOSSIBLE;
         break;
     }
-    if (simcall->issuer->host->isOff()) {
+    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) {
       XBT_DEBUG("Wait! This process is suspended and can't wake up now.");