X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/237fd22b56db7d1c67360c37559ce3aab16a002d..18080b8f80c81ed30600da55f774a52cbd1101f8:/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 5135d178fb..ff7c14a7e7 100644
--- a/teshsuite/surf/surf_usage/surf_usage.cpp
+++ b/teshsuite/surf/surf_usage/surf_usage.cpp
@@ -1,16 +1,17 @@
 /* A few basic tests for the surf library                                   */
 
-/* Copyright (c) 2004-2021. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2004-2022. 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 "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"
-#include "surf/surf.hpp"
+#include "src/kernel/EngineImpl.hpp"
+#include "src/kernel/resource/CpuImpl.hpp"
+#include "src/kernel/resource/NetworkModel.hpp"
 #include "xbt/config.hpp"
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(surf_test, "Messages specific for surf example");
@@ -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);
+  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]);
 
-  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();
 
@@ -68,9 +69,9 @@ int main(int argc, char** argv)
   /* Let's do something on it */
   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 = cpu_model_pm->get_failed_action_set();
@@ -105,7 +106,7 @@ int main(int argc, char** argv)
       action.unref();
     }
   } while ((net_model->get_started_action_set()->size() || cpu_model_pm->get_started_action_set()->size()) &&
-           surf_solve(-1.0) >= 0.0);
+           e.get_impl()->solve(-1.0) >= 0.0);
 
   XBT_DEBUG("Simulation Terminated");