Separate NetworkModel from LinkImpl.

[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 fbfac17..ff7c14a 100644 (file)
--- a/teshsuite/surf/surf_usage/surf_usage.cpp
+++ b/teshsuite/surf/surf_usage/surf_usage.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. */
@@ -9,9 +9,9 @@
 #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");
@@ -69,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", e.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();
@@ -106,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");