X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/192e6259fa0a0a0b2aa296b0492e63b9785f1fc7..d329aa1e53719e607fe180edfc7d6ecf49593fad:/teshsuite/simdag/platforms/is_router_test.c diff --git a/teshsuite/simdag/platforms/is_router_test.c b/teshsuite/simdag/platforms/is_router_test.c index b7622b4ef0..18751cbe09 100644 --- a/teshsuite/simdag/platforms/is_router_test.c +++ b/teshsuite/simdag/platforms/is_router_test.c @@ -7,9 +7,7 @@ #include #include #include "simgrid/simdag.h" -#include "surf/surf_private.h" - -extern routing_platf_t routing_platf; +#include "surf/surf.h" int main(int argc, char **argv) { @@ -18,22 +16,17 @@ int main(int argc, char **argv) xbt_lib_cursor_t cursor = NULL; char *key, *data; -#ifdef _XBT_WIN32 - setbuf(stderr, NULL); - setbuf(stdout, NULL); -#endif - SD_init(&argc, argv); /* creation of the environment */ SD_create_environment(argv[1]); - size = xbt_lib_length(host_lib) + xbt_lib_length(as_router_lib); + size = xbt_dict_length(host_list) + xbt_lib_length(as_router_lib); - printf("Workstation number: %d, link number: %d, elmts number: %d\n", - SD_workstation_get_number(), SD_link_get_number(), size); + printf("Workstation number: %zu, link number: %d, elmts number: %d\n", + sg_host_count(), sg_link_count(), size); - xbt_lib_foreach(host_lib, cursor, key, data) { + xbt_dict_foreach(host_list, cursor, key, data) { printf(" - Seen: \"%s\" is type : %d\n", key, (int) routing_get_network_element_type(key)); }