X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5d70f95ee9e74e70bbf4932bef39ae76fb592fbd..3be0396ca83e510e42adc8e3eb12f4befb2f1fff:/teshsuite/surf/surf_usage2/surf_usage2.cpp

diff --git a/teshsuite/surf/surf_usage2/surf_usage2.cpp b/teshsuite/surf/surf_usage2/surf_usage2.cpp
index 5288350b4d..0e1428e5f2 100644
--- a/teshsuite/surf/surf_usage2/surf_usage2.cpp
+++ b/teshsuite/surf/surf_usage2/surf_usage2.cpp
@@ -1,18 +1,18 @@
 /* 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/kernel/EngineImpl.hpp"
-#include "src/surf/cpu_interface.hpp"
-#include "src/surf/network_interface.hpp"
+#include "src/kernel/resource/CpuImpl.hpp"
+#include "src/kernel/resource/NetworkModel.hpp"
 #include "src/surf/surf_interface.hpp"
-#include "surf/surf.hpp"
 #include "xbt/config.hpp"
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(surf_test, "Messages specific for surf example");
@@ -21,37 +21,37 @@ int main(int argc, char** argv)
 {
   int running;
 
-  surf_init(&argc, argv); /* Initialize some common structures */
+  simgrid::s4u::Engine e(&argc, argv);
 
-  simgrid::config::set_parse("network/model:CM02");
-  simgrid::config::set_parse("cpu/model:Cas01");
+  simgrid::s4u::Engine::set_config("network/model:CM02");
+  simgrid::s4u::Engine::set_config("cpu/model:Cas01");
 
   xbt_assert(argc > 1, "Usage: %s platform.xml\n", argv[0]);
-  parse_platform_file(argv[1]);
+  e.load_platform(argv[1]);
 
   /*********************** HOST ***********************************/
-  simgrid::s4u::Host* hostA = sg_host_by_name("Cpu A");
-  simgrid::s4u::Host* hostB = sg_host_by_name("Cpu B");
+  simgrid::s4u::Host* hostA = e.host_by_name("Cpu A");
+  simgrid::s4u::Host* hostB = e.host_by_name("Cpu B");
 
   /* Let's do something on it */
-  hostA->pimpl_cpu->execution_start(1000.0);
-  hostB->pimpl_cpu->execution_start(1000.0);
-  hostB->pimpl_cpu->sleep(7.32);
+  hostA->get_cpu()->execution_start(1000.0, -1);
+  hostB->get_cpu()->execution_start(1000.0, -1);
+  hostB->get_cpu()->sleep(7.32);
 
-  const_sg_netzone_t as_zone                         = sg_zone_get_by_name("AS0");
-  simgrid::kernel::resource::NetworkModel* net_model = as_zone->get_impl()->get_network_model();
-  net_model->communicate(hostA, hostB, 150.0, -1.0);
+  const_sg_netzone_t as_zone = e.netzone_by_name_or_null("AS0");
+  auto net_model             = as_zone->get_impl()->get_network_model();
+  net_model->communicate(hostA, hostB, 150.0, -1.0, false);
 
-  surf_solve(-1.0); /* Takes traces into account. Returns 0.0 */
+  e.get_impl()->solve(-1.0); /* Takes traces into account. Returns 0.0 */
   do {
     simgrid::kernel::resource::Action* action = nullptr;
     running                                   = 0;
 
-    double now = surf_get_clock();
+    double now = simgrid::s4u::Engine::get_clock();
     XBT_INFO("Next Event : %g", now);
 
-    for (auto const& model : simgrid::kernel::EngineImpl::get_instance()->get_all_models()) {
-      if (model->get_started_action_set()->size() != 0) {
+    for (auto const& model : e.get_all_models()) {
+      if (not model->get_started_action_set()->empty()) {
         XBT_DEBUG("\t Running that model");
         running = 1;
       }
@@ -72,7 +72,7 @@ int main(int argc, char** argv)
         action = model->extract_done_action();
       }
     }
-  } while (running && surf_solve(-1.0) >= 0.0);
+  } while (running && e.get_impl()->solve(-1.0) >= 0.0);
 
   XBT_INFO("Simulation Terminated");
   return 0;