- 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::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*> 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) {
+ 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;
+ const char *type = "buggy";
+ if (nc->is_router())
+ type = "router";
+ if (nc->is_netzone())
+ type = "netzone";
+ if (nc->is_host())
+ type = "host";
+ std::printf(" - Seen: \"%s\". Type: %s\n", host->get_cname(), type);