X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/620ebcadff113065467e7f3c8412483666e05583..2e60fe3cfd5cf5305888fcca0ae19700d808bb23:/teshsuite/surf/surf_usage/surf_usage.cpp

diff --git a/teshsuite/surf/surf_usage/surf_usage.cpp b/teshsuite/surf/surf_usage/surf_usage.cpp
index 153da3f99d..35009f9abd 100644
--- a/teshsuite/surf/surf_usage/surf_usage.cpp
+++ b/teshsuite/surf/surf_usage/surf_usage.cpp
@@ -1,6 +1,6 @@
 /* A few basic tests for the surf library                                   */
 
-/* Copyright (c) 2004-2018. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2004-2020. 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. */
@@ -16,16 +16,16 @@ XBT_LOG_NEW_DEFAULT_CATEGORY(surf_test, "Messages specific for surf example");
 static const char* string_action(simgrid::kernel::resource::Action::State state)
 {
   switch (state) {
-    case simgrid::kernel::resource::Action::State::ready:
-      return "SURF_ACTION_READY";
-    case simgrid::kernel::resource::Action::State::running:
+    case simgrid::kernel::resource::Action::State::INITED:
+      return "SURF_ACTION_INITED";
+    case simgrid::kernel::resource::Action::State::STARTED:
       return "SURF_ACTION_RUNNING";
-    case simgrid::kernel::resource::Action::State::failed:
+    case simgrid::kernel::resource::Action::State::FAILED:
       return "SURF_ACTION_FAILED";
-    case simgrid::kernel::resource::Action::State::done:
+    case simgrid::kernel::resource::Action::State::FINISHED:
       return "SURF_ACTION_DONE";
-    case simgrid::kernel::resource::Action::State::not_in_the_system:
-      return "SURF_ACTION_NOT_IN_THE_SYSTEM";
+    case simgrid::kernel::resource::Action::State::IGNORED:
+      return "SURF_ACTION_IGNORED";
     default:
       return "INVALID STATE";
   }
@@ -46,9 +46,9 @@ int main(int argc, char **argv)
   simgrid::s4u::Host* hostB = sg_host_by_name("Cpu B");
 
   /* Let's do something on it */
-  simgrid::kernel::resource::Action* actionA = hostA->pimpl_cpu->execution_start(1000.0);
-  simgrid::kernel::resource::Action* actionB = hostB->pimpl_cpu->execution_start(1000.0);
-  simgrid::kernel::resource::Action* actionC = hostB->pimpl_cpu->sleep(7.32);
+  const simgrid::kernel::resource::Action* actionA = hostA->pimpl_cpu->execution_start(1000.0);
+  const simgrid::kernel::resource::Action* actionB = hostB->pimpl_cpu->execution_start(1000.0);
+  const simgrid::kernel::resource::Action* actionC = hostB->pimpl_cpu->sleep(7.32);
 
   simgrid::kernel::resource::Action::State stateActionA = actionA->get_state();
   simgrid::kernel::resource::Action::State stateActionB = actionB->get_state();
@@ -76,7 +76,7 @@ int main(int argc, char **argv)
       action.unref();
     }
 
-    action_list = surf_cpu_model_pm->get_done_action_set();
+    action_list = surf_cpu_model_pm->get_finished_action_set();
     while (not action_list->empty()) {
       simgrid::kernel::resource::Action& action = action_list->front();
       XBT_INFO("   CPU Done action");
@@ -92,16 +92,15 @@ int main(int argc, char **argv)
       action.unref();
     }
 
-    action_list = surf_network_model->get_done_action_set();
+    action_list = surf_network_model->get_finished_action_set();
     while (not action_list->empty()) {
       simgrid::kernel::resource::Action& action = action_list->front();
       XBT_INFO("   Network Done action");
       XBT_DEBUG("\t * Done : %p", &action);
       action.unref();
     }
-
   } while (
-      (surf_network_model->get_running_action_set()->size() || surf_cpu_model_pm->get_running_action_set()->size()) &&
+      (surf_network_model->get_started_action_set()->size() || surf_cpu_model_pm->get_started_action_set()->size()) &&
       surf_solve(-1.0) >= 0.0);
 
   XBT_DEBUG("Simulation Terminated");