- size = xbt_dict_length(host_list) + 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"));
+ 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<simgrid::kernel::routing::NetPoint*> netcardList;
+ simgrid::s4u::Engine::getInstance()->getNetpointList(&netcardList);
+ std::sort(netcardList.begin(), netcardList.end(),
+ [](simgrid::kernel::routing::NetPoint* a, simgrid::kernel::routing::NetPoint* b) {
+ return a->name() < b->name();
+ });
+
+ int it;
+ sg_host_t host;
+ xbt_dynar_foreach(hosts, it, host) {
+ simgrid::kernel::routing::NetPoint* nc = host->pimpl_netpoint;
+ const char *type = "buggy";
+ if (nc->isRouter())
+ type = "router";
+ if (nc->isNetZone())
+ type = "netzone";
+ if (nc->isHost())
+ type = "host";
+ std::printf(" - Seen: \"%s\". Type: %s\n", host->getCname(), type);