From f00304f35fc10b4c8d3cdb6c2d910131c4169ef9 Mon Sep 17 00:00:00 2001 From: navarrop Date: Tue, 28 Sep 2010 13:10:45 +0000 Subject: [PATCH] The basic parser can be run with option. nothing just parse the xml ONE_LINK give on link between the 2 first hosts FULL_LINK give all links between hosts git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@8287 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- .../simdag/platforms/basic_parsing_test.c | 75 ++++++++++++++----- 1 file changed, 55 insertions(+), 20 deletions(-) diff --git a/teshsuite/simdag/platforms/basic_parsing_test.c b/teshsuite/simdag/platforms/basic_parsing_test.c index f7ed3041ca..ecd1df8ca9 100644 --- a/teshsuite/simdag/platforms/basic_parsing_test.c +++ b/teshsuite/simdag/platforms/basic_parsing_test.c @@ -17,34 +17,69 @@ int main(int argc, char **argv) const SD_link_t *route; const char *name1; const char *name2; - int route_size,i; + int route_size,i,j,k; + int list_size; 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()); - 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(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); + + 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)); + } + } + + } + +} SD_exit(); return 0; -- 2.20.1