please sonar, set_config is a static method

[simgrid.git] / 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 9e43b7b..fbfac17 100644 (file)
--- a/teshsuite/surf/surf_usage/surf_usage.cpp
+++ b/teshsuite/surf/surf_usage/surf_usage.cpp
@@ -7,6 +7,7 @@
 
 #include "simgrid/host.h"
 #include "simgrid/kernel/routing/NetZoneImpl.hpp" // full type for NetZoneImpl object
+#include "simgrid/s4u/Engine.hpp"
 #include "simgrid/zone.h"
 #include "src/surf/cpu_interface.hpp"
 #include "src/surf/network_interface.hpp"
@@ -35,26 +36,26 @@ static const char* string_action(simgrid::kernel::resource::Action::State state)
 
 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]);
 
-  sg_netzone_t as_zone                               = sg_zone_get_by_name("AS0");
-  simgrid::kernel::resource::NetworkModel* net_model = as_zone->get_impl()->get_network_model();
-  simgrid::kernel::resource::CpuModel* cpu_model_pm  = as_zone->get_impl()->get_cpu_pm_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);
-  XBT_DEBUG("Network model: %p", net_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();
@@ -70,7 +71,7 @@ int main(int argc, char** argv)
 
   surf_solve(-1.0);
   do {
-    XBT_INFO("Next Event : %g", surf_get_clock());
+    XBT_INFO("Next Event : %g", e.get_clock());
     XBT_DEBUG("\t CPU actions");
 
     simgrid::kernel::resource::Action::StateSet* action_list = cpu_model_pm->get_failed_action_set();