X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f3b7e5f4b4d7c87ee3e8827313ec966ea8fc8387..bc32dc8200e58f87951a43bf5ba56bf116f08e62:/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 35009f9abd..32f8006850 100644
--- a/teshsuite/surf/surf_usage/surf_usage.cpp
+++ b/teshsuite/surf/surf_usage/surf_usage.cpp
@@ -1,14 +1,17 @@
 /* A few basic tests for the surf library                                   */
 
-/* Copyright (c) 2004-2020. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2004-2021. 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/host.h"
-#include "src/surf/cpu_interface.hpp"
+#include "simgrid/kernel/routing/NetZoneImpl.hpp" // full type for NetZoneImpl object
+#include "simgrid/s4u/Engine.hpp"
+#include "simgrid/zone.h"
+#include "src/kernel/EngineImpl.hpp"
+#include "src/kernel/resource/CpuImpl.hpp"
 #include "src/surf/network_interface.hpp"
-#include "surf/surf.hpp"
 #include "xbt/config.hpp"
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(surf_test, "Messages specific for surf example");
@@ -31,24 +34,28 @@ static const char* string_action(simgrid::kernel::resource::Action::State state)
   }
 }
 
-int main(int argc, char **argv)
+int main(int argc, char** argv)
 {
-  surf_init(&argc, argv);       /* Initialize some common structures */
-  simgrid::config::set_parse("cpu/model:Cas01");
-  simgrid::config::set_parse("network/model:CM02");
+  simgrid::s4u::Engine e(&argc, argv);
+  simgrid::s4u::Engine::set_config("cpu/model:Cas01");
+  simgrid::s4u::Engine::set_config("network/model:CM02");
 
   xbt_assert(argc > 1, "Usage: %s platform.xml\n", argv[0]);
-  parse_platform_file(argv[1]);
+  e.load_platform(argv[1]);
 
-  XBT_DEBUG("CPU model: %p", surf_cpu_model_pm);
-  XBT_DEBUG("Network model: %p", surf_network_model);
+  const_sg_netzone_t as_zone = e.netzone_by_name_or_null("AS0");
+  auto net_model             = as_zone->get_impl()->get_network_model();
+  auto cpu_model_pm          = as_zone->get_impl()->get_cpu_pm_model();
+
+  XBT_DEBUG("CPU model: %p", cpu_model_pm.get());
+  XBT_DEBUG("Network model: %p", net_model.get());
   simgrid::s4u::Host* hostA = sg_host_by_name("Cpu A");
   simgrid::s4u::Host* hostB = sg_host_by_name("Cpu B");
 
   /* Let's do something on it */
-  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);
+  const simgrid::kernel::resource::Action* actionA = hostA->get_cpu()->execution_start(1000.0, -1);
+  const simgrid::kernel::resource::Action* actionB = hostB->get_cpu()->execution_start(1000.0, -1);
+  const simgrid::kernel::resource::Action* actionC = hostB->get_cpu()->sleep(7.32);
 
   simgrid::kernel::resource::Action::State stateActionA = actionA->get_state();
   simgrid::kernel::resource::Action::State stateActionB = actionB->get_state();
@@ -59,16 +66,15 @@ int main(int argc, char **argv)
   XBT_INFO("actionB state: %s", string_action(stateActionB));
   XBT_INFO("actionC state: %s", string_action(stateActionC));
 
-
   /* Let's do something on it */
-  surf_network_model->communicate(hostA, hostB, 150.0, -1.0);
+  net_model->communicate(hostA, hostB, 150.0, -1.0);
 
-  surf_solve(-1.0);
+  e.get_impl()->solve(-1.0);
   do {
-    XBT_INFO("Next Event : %g", surf_get_clock());
+    XBT_INFO("Next Event : %g", simgrid::s4u::Engine::get_clock());
     XBT_DEBUG("\t CPU actions");
 
-    simgrid::kernel::resource::Action::StateSet* action_list = surf_cpu_model_pm->get_failed_action_set();
+    simgrid::kernel::resource::Action::StateSet* action_list = cpu_model_pm->get_failed_action_set();
     while (not action_list->empty()) {
       simgrid::kernel::resource::Action& action = action_list->front();
       XBT_INFO("   CPU Failed action");
@@ -76,7 +82,7 @@ int main(int argc, char **argv)
       action.unref();
     }
 
-    action_list = surf_cpu_model_pm->get_finished_action_set();
+    action_list = 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");
@@ -84,7 +90,7 @@ int main(int argc, char **argv)
       action.unref();
     }
 
-    action_list = surf_network_model->get_failed_action_set();
+    action_list = net_model->get_failed_action_set();
     while (not action_list->empty()) {
       simgrid::kernel::resource::Action& action = action_list->front();
       XBT_INFO("   Network Failed action");
@@ -92,16 +98,15 @@ int main(int argc, char **argv)
       action.unref();
     }
 
-    action_list = surf_network_model->get_finished_action_set();
+    action_list = net_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_started_action_set()->size() || surf_cpu_model_pm->get_started_action_set()->size()) &&
-      surf_solve(-1.0) >= 0.0);
+  } while ((net_model->get_started_action_set()->size() || cpu_model_pm->get_started_action_set()->size()) &&
+           e.get_impl()->solve(-1.0) >= 0.0);
 
   XBT_DEBUG("Simulation Terminated");