Start the SimDag revolution: function factoring

[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 b51d24a..8998c09 100644 (file)
--- a/teshsuite/simdag/platforms/basic_parsing_test.c
+++ b/teshsuite/simdag/platforms/basic_parsing_test.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2008, 2009, 2010. The SimGrid Team.
+/* Copyright (c) 2008-2015. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -6,14 +6,11 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include "simdag/simdag.h"
-#include "surf/surf_private.h"
-
-extern routing_platf_t routing_platf;
+#include "simgrid/simdag.h"
 
 int main(int argc, char **argv)
 {
-  /* initialisation of SD */
+  /* SD initialization */
 
   SD_workstation_t w1, w2;
   const SD_workstation_t *workstations;
@@ -23,14 +20,19 @@ int main(int argc, char **argv)
   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_number(), SD_link_get_number());
+         SD_workstation_get_count(), sg_link_count());
 
   if (argc >= 3) {
     if (!strcmp(argv[2], "ONE_LINK")) {
@@ -46,17 +48,17 @@ int main(int argc, char **argv)
       printf("Route size %d\n", route_size);
       for (i = 0; i < route_size; i++) {
       printf("  Link %s: latency = %f, bandwidth = %f\n",
-           SD_link_get_name(route[i]),
-           SD_link_get_current_latency(route[i]),
-           SD_link_get_current_bandwidth(route[i]));
+           sg_link_name(route[i]),
+           sg_link_latency(route[i]),
+           sg_link_bandwidth(route[i]));
       }
       printf("Route latency = %f, route bandwidth = %f\n",
-         SD_route_get_current_latency(w1, w2),
-         SD_route_get_current_bandwidth(w1, w2));
+         SD_route_get_latency(w1, w2),
+         SD_route_get_bandwidth(w1, w2));
     }
     if (!strcmp(argv[2], "FULL_LINK")) {
       workstations = SD_workstation_get_list();
-      list_size = SD_workstation_get_number();
+      list_size = SD_workstation_get_count();
       for (i = 0; i < list_size; i++) {
       w1 = workstations[i];
       name1 = SD_workstation_get_name(w1);
@@ -69,16 +71,21 @@ int main(int argc, char **argv)
         printf("  Route size %d\n", route_size);
         for (k = 0; k < route_size; k++) {
         printf("  Link %s: latency = %f, bandwidth = %f\n",
-             SD_link_get_name(route[k]),
-             SD_link_get_current_latency(route[k]),
-             SD_link_get_current_bandwidth(route[k]));
+             sg_link_name(route[k]),
+             sg_link_latency(route[k]),
+             sg_link_bandwidth(route[k]));
         }
         printf("  Route latency = %f, route bandwidth = %f\n",
-           SD_route_get_current_latency(w1, w2),
-           SD_route_get_current_bandwidth(w1, w2));
+           SD_route_get_latency(w1, w2),
+           SD_route_get_bandwidth(w1, w2));
       }
       }
     }
+    if (!strcmp(argv[2], "PROP")) {
+      printf("SG_TEST_mem: %s\n",
+          SD_workstation_get_property_value(SD_workstation_get_by_name("host1"),
+          "SG_TEST_mem"));
+    }
   }
 
   SD_exit();