Completely revise the way to deal with Streamed I/Os

[simgrid.git] / 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 e850b20..0e1428e 100644 (file)
--- a/teshsuite/surf/surf_usage2/surf_usage2.cpp
+++ b/teshsuite/surf/surf_usage2/surf_usage2.cpp
@@ -1,6 +1,6 @@
 /* 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. */
@@ -10,10 +10,9 @@
 #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");
@@ -24,8 +23,8 @@ int main(int argc, char** argv)
 
   simgrid::s4u::Engine e(&argc, argv);
 
-  e.set_config("network/model:CM02");
-  e.set_config("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]);
   e.load_platform(argv[1]);
@@ -41,14 +40,14 @@ int main(int argc, char** argv)
 
   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);
+  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 = e.get_clock();
+    double now = simgrid::s4u::Engine::get_clock();
     XBT_INFO("Next Event : %g", now);
 
     for (auto const& model : e.get_all_models()) {
@@ -73,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;