From 4c913a25905c1146f91491d19cfec66d8f5afb8c Mon Sep 17 00:00:00 2001 From: navarrop Date: Tue, 8 Mar 2011 12:35:22 +0000 Subject: [PATCH] We can have more than 3 args in basic_parsing_test. git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@9769 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- .../simdag/platforms/basic_parsing_test.c | 100 +++++++++--------- 1 file changed, 51 insertions(+), 49 deletions(-) diff --git a/teshsuite/simdag/platforms/basic_parsing_test.c b/teshsuite/simdag/platforms/basic_parsing_test.c index 1d9f08c8fa..ac610fc2b8 100644 --- a/teshsuite/simdag/platforms/basic_parsing_test.c +++ b/teshsuite/simdag/platforms/basic_parsing_test.c @@ -30,56 +30,58 @@ 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); - - 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++) { - 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)); - } - } - - } + if (argc >= 3) { + for(i=1;i