X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f00304f35fc10b4c8d3cdb6c2d910131c4169ef9..23ee32e629dadf8dcac3da800ff641356e33ff8a:/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 ecd1df8ca9..9b9a5be9d6 100644
--- a/teshsuite/simdag/platforms/basic_parsing_test.c
+++ b/teshsuite/simdag/platforms/basic_parsing_test.c
@@ -7,6 +7,9 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include "simdag/simdag.h"
+#include "surf/surf_private.h"
+
+extern routing_global_t global_routing;
 
 int main(int argc, char **argv)
 {
@@ -17,7 +20,7 @@ int main(int argc, char **argv)
   const SD_link_t *route;
   const char *name1;
   const char *name2;
-  int route_size,i,j,k;
+  int route_size, i, j, k;
   int list_size;
 
   SD_init(&argc, argv);
@@ -27,59 +30,60 @@ 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(!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);
+  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);
 
-	  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));
-	}
-	if(!strcmp(argv[2],"FULL_LINK"))
-	{
-			workstations = SD_workstation_get_list();
-			list_size = SD_workstation_get_number();
-			for(i = 0; i < list_size; i++)
-			{
-				for(j = 0 ; j < list_size; j++)
-				{
-						  w1 = workstations[i];
-						  w2 = workstations[j];
-						  name1 = SD_workstation_get_name(w1);
-						  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));
+		  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;
 			}
-
-	}
-
-}
+		}
+  }
+  }
 
   SD_exit();
   return 0;