Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
don't load private headers from C tests: they will turn to C++
[simgrid.git] / teshsuite / simdag / platforms / is_router_test.c
index b7622b4..bcefb82 100644 (file)
@@ -7,9 +7,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #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)
 {
@@ -28,12 +26,12 @@ int main(int argc, char **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));
   }