Move globals to EngineImpl

[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 27a1ac9..27a6e78 100644 (file)
--- a/teshsuite/surf/surf_usage2/surf_usage2.cpp
+++ b/teshsuite/surf/surf_usage2/surf_usage2.cpp
@@ -1,29 +1,30 @@
 /* A few basic tests for the surf library                                   */
 
-/* Copyright (c) 2004-2015. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2004-2021. 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 "surf/surf.h"
-#include "simgrid/s4u/host.hpp"
-#include "simgrid/sg_config.h"
+#include "simgrid/host.h"
+#include "simgrid/kernel/routing/NetZoneImpl.hpp" // full type for NetZoneImpl object
+#include "simgrid/zone.h"
+#include "src/kernel/EngineImpl.hpp"
 #include "src/surf/cpu_interface.hpp"
 #include "src/surf/network_interface.hpp"
 #include "src/surf/surf_interface.hpp"
+#include "surf/surf.hpp"
+#include "xbt/config.hpp"
 
-#include "xbt/log.h"
 XBT_LOG_NEW_DEFAULT_CATEGORY(surf_test, "Messages specific for surf example");
 
-int main(int argc, char **argv)
+int main(int argc, char** argv)
 {
-  double now = -1.0;
   int running;
 
-  surf_init(&argc, argv);       /* Initialize some common structures */
+  surf_init(&argc, argv); /* Initialize some common structures */
 
-  xbt_cfg_set_parse("network/model:CM02");
-  xbt_cfg_set_parse("cpu/model:Cas01");
+  simgrid::config::set_parse("network/model:CM02");
+  simgrid::config::set_parse("cpu/model:Cas01");
 
   xbt_assert(argc > 1, "Usage: %s platform.xml\n", argv[0]);
   parse_platform_file(argv[1]);
@@ -35,38 +36,40 @@ int main(int argc, char **argv)
   /* Let's do something on it */
   hostA->pimpl_cpu->execution_start(1000.0);
   hostB->pimpl_cpu->execution_start(1000.0);
-  surf_host_sleep(hostB, 7.32);
+  hostB->pimpl_cpu->sleep(7.32);
 
-  surf_network_model->communicate(hostA, hostB, 150.0, -1.0);
+  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);
 
-  surf_solve(-1.0);                 /* Takes traces into account. Returns 0.0 */
+  surf_solve(-1.0); /* Takes traces into account. Returns 0.0 */
   do {
-    surf_action_t action = nullptr;
-    running = 0;
+    simgrid::kernel::resource::Action* action = nullptr;
+    running                                   = 0;
 
-    now = surf_get_clock();
+    double now = surf_get_clock();
     XBT_INFO("Next Event : %g", now);
 
-    for (auto model: *all_existing_models) {
-      if (surf_model_running_action_set_size(model)) {
+    for (auto const& model : simgrid::kernel::EngineImpl::get_instance()->get_all_models()) {
+      if (model->get_started_action_set()->size() != 0) {
         XBT_DEBUG("\t Running that model");
         running = 1;
       }
 
-      action = surf_model_extract_failed_action_set(model);
+      action = model->extract_failed_action();
       while (action != nullptr) {
         XBT_INFO("   * Done Action");
         XBT_DEBUG("\t * Failed Action: %p", action);
         action->unref();
-        action = surf_model_extract_failed_action_set(model);
+        action = model->extract_failed_action();
       }
 
-      action = surf_model_extract_done_action_set(model);
-      while (action != nullptr){
+      action = model->extract_done_action();
+      while (action != nullptr) {
         XBT_INFO("   * Done Action");
         XBT_DEBUG("\t * Done Action: %p", action);
         action->unref();
-        action = surf_model_extract_done_action_set(model);
+        action = model->extract_done_action();
       }
     }
   } while (running && surf_solve(-1.0) >= 0.0);