X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4e14c20ad6318c05db82275e7d387f5090facc96..a9786d0c1612118b9fc2304ea7aa36b67b232267:/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 9e056dda0c..585b8ced22 100644
--- a/teshsuite/simdag/is-router/is-router.cpp
+++ b/teshsuite/simdag/is-router/is-router.cpp
@@ -1,38 +1,39 @@
-/* Copyright (c) 2008-2015. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2008-2016. 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 <stdio.h>
+#include "simgrid/s4u/engine.hpp"
+#include "simgrid/s4u/host.hpp"
 #include "simgrid/simdag.h"
-#include "src/surf/surf_routing.hpp"
+#include "src/kernel/routing/NetCard.hpp"
+#include "surf/surf_routing.h"
+#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();
+  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);
 
-  xbt_dict_foreach(host_list, cursor, key, data) {
-    simgrid::surf::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->cname(),
+           nc->isRouter() ? "router" : (nc->isNetZone() ? "netzone" : "host"));
   }
+  xbt_dynar_free(&hosts);
 
-  xbt_lib_foreach(as_router_lib, cursor, key, data) {
-    simgrid::surf::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;