plug last leaks

[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 5135d17..ac00e2a 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,14 +36,14 @@ 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);
+  e.set_config("cpu/model:Cas01");
+  e.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]);
 
-  const_sg_netzone_t as_zone = sg_zone_get_by_name("AS0");
+  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();
 
@@ -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();