X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f783ed4680c6862a1b7543237e89d1221334bae0..d42d0c6f54ae825a249799cb1e4e2920de5205c8:/teshsuite/simdag/platforms/basic_parsing_test.c?ds=sidebyside

diff --git a/teshsuite/simdag/platforms/basic_parsing_test.c b/teshsuite/simdag/platforms/basic_parsing_test.c
index 7e3f5e3785..d361c39593 100644
--- 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,86 +6,58 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include "simdag/simdag.h"
-#include "surf/surf_private.h"
-
-extern routing_global_t global_routing;
+#include "simgrid/simdag.h"
 
 int main(int argc, char **argv)
 {
-  /* initialisation of SD */
-
-  SD_workstation_t w1, w2;
-  const SD_workstation_t *workstations;
-  const SD_link_t *route;
-  const char *name1;
-  const char *name2;
-  int route_size, i, j, k;
-  int list_size;
-
-  setvbuf(stdout, NULL, _IOLBF, 0);
-
   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());
+  printf("Workstation number: %zu, link number: %d\n", sg_host_count(), sg_link_count());
 
+  sg_host_t *workstations = sg_host_list();
   if (argc >= 3) {
-  for(i=1;i<argc;i++)
-  {
-		if (!strcmp(argv[i], "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);
+    if (!strcmp(argv[2], "ONE_LINK")) {
+      sg_host_t w1 = workstations[0];
+      sg_host_t w2 = workstations[1];
+      const char *name1 = sg_host_get_name(w1);
+      const char *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);
-		  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("Route latency = %f, route bandwidth = %f\n",
-				 SD_route_get_current_latency(w1, w2),
-				 SD_route_get_current_bandwidth(w1, w2));
-		  i=argc;
-		}else{
-			if (!strcmp(argv[i], "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));
-				}
-			  }
-			  i=argc;
-			}
-		}
-  }
+      printf("Route between %s and %s\n", name1, name2);
+      SD_link_t *route = SD_route_get_list(w1, w2);
+      int route_size = SD_route_get_size(w1, w2);
+      printf("Route size %d\n", route_size);
+      for (int i = 0; i < route_size; i++)
+        printf("  Link %s: latency = %f, bandwidth = %f\n", 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_latency(w1, w2), SD_route_get_bandwidth(w1, w2));
+      xbt_free(route);
+    }
+    if (!strcmp(argv[2], "FULL_LINK")) {
+      int list_size = sg_host_count();
+      for (int i = 0; i < list_size; i++) {
+        sg_host_t w1 = workstations[i];
+        const char *name1 = sg_host_get_name(w1);
+        for (int j = 0; j < list_size; j++) {
+          sg_host_t w2 = workstations[j];
+          const char *name2 = sg_host_get_name(w2);
+          printf("Route between %s and %s\n", name1, name2);
+          SD_link_t *route = SD_route_get_list(w1, w2);
+          int route_size = SD_route_get_size(w1, w2);
+          printf("  Route size %d\n", route_size);
+          for (int k = 0; k < route_size; k++) {
+            printf("  Link %s: latency = %f, bandwidth = %f\n",
+                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_latency(w1, w2), SD_route_get_bandwidth(w1, w2));
+          xbt_free(route);
+        }
+      }
+    }
+    if (!strcmp(argv[2], "PROP"))
+      printf("SG_TEST_mem: %s\n", sg_host_get_property_value(sg_host_by_name("host1"), "SG_TEST_mem"));
   }
+  xbt_free(workstations);
 
   SD_exit();
   return 0;