new function: Engine::netcardList()

[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 3c963c9..585b8ce 100644 (file)
--- a/teshsuite/simdag/is-router/is-router.cpp
+++ b/teshsuite/simdag/is-router/is-router.cpp
@@ -3,10 +3,11 @@
 /* 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 "simgrid/s4u/engine.hpp"
 #include "simgrid/s4u/host.hpp"
 #include "simgrid/simdag.h"
 #include "src/kernel/routing/NetCard.hpp"
-#include "src/surf/surf_routing.hpp"
+#include "surf/surf_routing.h"
 #include <stdio.h>
 
 int main(int argc, char **argv)
@@ -15,25 +16,24 @@ int main(int argc, char **argv)
   SD_create_environment(argv[1]);
 
   xbt_dynar_t hosts = sg_hosts_as_dynar();
-  int size = sg_host_count() + xbt_lib_length(as_router_lib);
+  printf("Host count: %zu, link number: %d\n", sg_host_count(), sg_link_count());
 
-  printf("Host number: %zu, link number: %d, elmts number: %d\n", sg_host_count(), sg_link_count(), size);
+  std::vector<simgrid::kernel::routing::NetCard*> netcardList;
+  simgrid::s4u::Engine::instance()->netcardList(&netcardList);
 
   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"));
+    printf("   - Seen: \"%s\". Type: %s\n", host->cname(),
+           nc->isRouter() ? "router" : (nc->isNetZone() ? "netzone" : "host"));
   }
   xbt_dynar_free(&hosts);
 
-  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"));
-  }
+  printf("NetCards count: %d\n", xbt_dict_length(netcards_dict));
+  for (auto nc : netcardList)
+    printf("   - Seen: \"%s\". Type: %s\n", nc->cname(),
+           nc->isRouter() ? "router" : (nc->isNetZone() ? "netzone" : "host"));
 
   SD_exit();
   return 0;