kill old cruft

[simgrid.git] / teshsuite / simdag / platforms / basic_parsing_test.c

diff --git a/teshsuite/simdag/platforms/basic_parsing_test.c b/teshsuite/simdag/platforms/basic_parsing_test.c
index 8998c09..1d53c0d 100644 (file)
--- a/teshsuite/simdag/platforms/basic_parsing_test.c
+++ b/teshsuite/simdag/platforms/basic_parsing_test.c
@@ -12,35 +12,28 @@ int main(int argc, char **argv)
 {
   /* SD initialization */
 
-  SD_workstation_t w1, w2;
-  const SD_workstation_t *workstations;
-  const SD_link_t *route;
+  sg_host_t w1, w2;
+  sg_host_t *workstations;
+  SD_link_t *route;
   const char *name1;
   const char *name2;
   int route_size, i, j, k;
   int list_size;
 
-#ifdef _XBT_WIN32
-  setbuf(stderr, NULL);
-  setbuf(stdout, NULL);
-#else
-  setvbuf(stdout, NULL, _IOLBF, 0);
-#endif
-
   SD_init(&argc, argv);
 
   /* creation of the environment */
   SD_create_environment(argv[1]);
-  printf("Workstation number: %d, link number: %d\n",
-         SD_workstation_get_count(), sg_link_count());
+  printf("Workstation number: %zu, link number: %d\n",
+         sg_host_count(), sg_link_count());
 
+  workstations = sg_host_list();
   if (argc >= 3) {
     if (!strcmp(argv[2], "ONE_LINK")) {
-      workstations = SD_workstation_get_list();
       w1 = workstations[0];
       w2 = workstations[1];
-      name1 = SD_workstation_get_name(w1);
-      name2 = SD_workstation_get_name(w2);
+      name1 = sg_host_get_name(w1);
+      name2 = sg_host_get_name(w2);
 
       printf("Route between %s and %s\n", name1, name2);
       route = SD_route_get_list(w1, w2);
@@ -55,16 +48,16 @@ int main(int argc, char **argv)
       printf("Route latency = %f, route bandwidth = %f\n",
          SD_route_get_latency(w1, w2),
          SD_route_get_bandwidth(w1, w2));
+      xbt_free(route);
     }
     if (!strcmp(argv[2], "FULL_LINK")) {
-      workstations = SD_workstation_get_list();
-      list_size = SD_workstation_get_count();
+      list_size = sg_host_count();
       for (i = 0; i < list_size; i++) {
       w1 = workstations[i];
-      name1 = SD_workstation_get_name(w1);
+      name1 = sg_host_get_name(w1);
       for (j = 0; j < list_size; j++) {
         w2 = workstations[j];
-        name2 = SD_workstation_get_name(w2);
+        name2 = sg_host_get_name(w2);
         printf("Route between %s and %s\n", name1, name2);
         route = SD_route_get_list(w1, w2);
         route_size = SD_route_get_size(w1, w2);
@@ -78,15 +71,17 @@ int main(int argc, char **argv)
         printf("  Route latency = %f, route bandwidth = %f\n",
            SD_route_get_latency(w1, w2),
            SD_route_get_bandwidth(w1, w2));
+        xbt_free(route);
       }
       }
     }
     if (!strcmp(argv[2], "PROP")) {
       printf("SG_TEST_mem: %s\n",
-          SD_workstation_get_property_value(SD_workstation_get_by_name("host1"),
+          sg_host_get_property_value(sg_host_by_name("host1"),
           "SG_TEST_mem"));
     }
   }
+  xbt_free(workstations);
 
   SD_exit();
   return 0;