do not use sg_hosts_as_dynar in C++

[simgrid.git] / teshsuite / simdag / is-router / is-router.cpp

diff --git a/teshsuite/simdag/is-router/is-router.cpp b/teshsuite/simdag/is-router/is-router.cpp
index 35441df..5acb60c 100644 (file)
--- a/teshsuite/simdag/is-router/is-router.cpp
+++ b/teshsuite/simdag/is-router/is-router.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2008-2019. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2008-2020. 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. */
@@ -16,20 +16,18 @@ int main(int argc, char **argv)
   SD_init(&argc, argv);
   SD_create_environment(argv[1]);
 
-  xbt_dynar_t hosts = sg_hosts_as_dynar();
-  std::printf("Host count: %zu, link number: %d\n", sg_host_count(), sg_link_count());
+  std::vector<sg_host_t> hosts = simgrid::s4u::Engine::get_instance()->get_all_hosts();
+  std::printf("Host count: %zu, link number: %d\n", hosts.size(), sg_link_count());
 
   std::vector<simgrid::kernel::routing::NetPoint*> netpoints =
       simgrid::s4u::Engine::get_instance()->get_all_netpoints();
   std::sort(netpoints.begin(), netpoints.end(),
-            [](simgrid::kernel::routing::NetPoint* a, simgrid::kernel::routing::NetPoint* b) {
+            [](const simgrid::kernel::routing::NetPoint* a, const simgrid::kernel::routing::NetPoint* b) {
               return a->get_name() < b->get_name();
             });
 
-  int it;
-  sg_host_t host;
-  xbt_dynar_foreach(hosts, it, host) {
-    simgrid::kernel::routing::NetPoint* nc = host->pimpl_netpoint;
+  for (const auto& host : hosts) {
+    const simgrid::kernel::routing::NetPoint* nc = host->get_netpoint();
     const char *type = "buggy";
     if (nc->is_router())
       type = "router";
@@ -39,7 +37,6 @@ int main(int argc, char **argv)
       type = "host";
     std::printf("   - Seen: \"%s\". Type: %s\n", host->get_cname(), type);
   }
-  xbt_dynar_free(&hosts);
 
   std::printf("NetCards count: %zu\n", netpoints.size());
   for (auto const& nc : netpoints) {