Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid into...

[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 1d9f08c..c01e31e 100644 (file)
--- a/teshsuite/simdag/platforms/basic_parsing_test.c
+++ b/teshsuite/simdag/platforms/basic_parsing_test.c
@@ -9,7 +9,7 @@
 #include "simdag/simdag.h"
 #include "surf/surf_private.h"
 
-extern routing_global_t global_routing;
+extern routing_platf_t routing_platf;
 
 int main(int argc, char **argv)
 {
@@ -23,6 +23,8 @@ int main(int argc, char **argv)
   int route_size, i, j, k;
   int list_size;
 
+  setvbuf(stdout, NULL, _IOLBF, 0);
+
   SD_init(&argc, argv);
 
   /* creation of the environment */
@@ -30,7 +32,7 @@ int main(int argc, char **argv)
   printf("Workstation number: %d, link number: %d\n",
          SD_workstation_get_number(), SD_link_get_number());
 
-  if (argc == 3) {
+  if (argc >= 3) {
     if (!strcmp(argv[2], "ONE_LINK")) {
       workstations = SD_workstation_get_list();
       w1 = workstations[0];
@@ -43,43 +45,49 @@ int main(int argc, char **argv)
       route_size = SD_route_get_size(w1, w2);
       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]));
+      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]));
       }
       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_current_latency(w1, w2),
+         SD_route_get_current_bandwidth(w1, w2));
     }
     if (!strcmp(argv[2], "FULL_LINK")) {
       workstations = SD_workstation_get_list();
       list_size = SD_workstation_get_number();
       for (i = 0; i < list_size; i++) {
-        w1 = workstations[i];
-        name1 = SD_workstation_get_name(w1);
-        for (j = 0; j < list_size; j++) {
-          w2 = workstations[j];
-          name2 = SD_workstation_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);
-          printf("\tRoute size %d\n", route_size);
-          for (k = 0; k < route_size; k++) {
-            printf("\tLink %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]));
-          }
-          printf("\tRoute latency = %f, route bandwidth = %f\n",
-                 SD_route_get_current_latency(w1, w2),
-                 SD_route_get_current_bandwidth(w1, w2));
+      w1 = workstations[i];
+      name1 = SD_workstation_get_name(w1);
+      for (j = 0; j < list_size; j++) {
+        w2 = workstations[j];
+        name2 = SD_workstation_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);
+        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]));
         }
+        printf("  Route latency = %f, route bandwidth = %f\n",
+           SD_route_get_current_latency(w1, w2),
+           SD_route_get_current_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")
+          );
+      printf("Author: %s\n", SD_as_router_get_property_value("AS0", "author"));
+      printf("AS1: %s\n", SD_as_router_get_property_value("AS1", "name"));
+      printf("AS2: %s\n", SD_as_router_get_property_value("AS2", "name"));
+    }
   }
 
   SD_exit();