X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d785a64b1830b6a5d05561316ef7161ee1c67671..57f43123324060abac790419f9a415e8a464be53:/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 680fce3fb6..3c963c99f8 100644
--- a/teshsuite/simdag/is-router/is-router.cpp
+++ b/teshsuite/simdag/is-router/is-router.cpp
@@ -3,32 +3,34 @@
 /* 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 <stdio.h>
+#include "simgrid/s4u/host.hpp"
 #include "simgrid/simdag.h"
+#include "src/kernel/routing/NetCard.hpp"
 #include "src/surf/surf_routing.hpp"
+#include <stdio.h>
 
 int main(int argc, char **argv)
 {
-  /* SD initialization */
-  int size;
-  xbt_lib_cursor_t cursor = nullptr;
-  char *key, *data;
-
   SD_init(&argc, argv);
-
-  /* creation of the environment */
   SD_create_environment(argv[1]);
 
-  size = xbt_dict_length(host_list) + xbt_lib_length(as_router_lib);
+  xbt_dynar_t hosts = sg_hosts_as_dynar();
+  int size = sg_host_count() + xbt_lib_length(as_router_lib);
 
   printf("Host number: %zu, link number: %d, elmts number: %d\n", sg_host_count(), sg_link_count(), size);
 
-  xbt_dict_foreach(host_list, cursor, key, data) {
-    simgrid::kernel::routing::NetCard * nc = sg_netcard_by_name_or_null(key);
-    printf("   - Seen: \"%s\". Type: %s\n", key, nc->isRouter() ? "router" : (nc->isAS()?"AS":"host"));
+  int it;
+  sg_host_t host;
+  xbt_dynar_foreach(hosts, it, host) {
+    simgrid::kernel::routing::NetCard * nc = host->pimpl_netcard;
+    printf("   - Seen: \"%s\". Type: %s\n", host->name().c_str(), nc->isRouter() ? "router" : (nc->isAS()?"AS":"host"));
   }
+  xbt_dynar_free(&hosts);
 
-  xbt_lib_foreach(as_router_lib, cursor, key, data) {
+  xbt_lib_cursor_t cursor = nullptr;
+  char* key;
+  void *ignored;
+  xbt_lib_foreach(as_router_lib, cursor, key, ignored) {
     simgrid::kernel::routing::NetCard * nc = sg_netcard_by_name_or_null(key);
     printf("   - Seen: \"%s\". Type: %s\n", key, nc->isRouter() ? "router" : (nc->isAS()?"AS":"host"));
   }