From 23ee32e629dadf8dcac3da800ff641356e33ff8a Mon Sep 17 00:00:00 2001 From: navarrop Date: Wed, 9 Mar 2011 16:41:36 +0000 Subject: [PATCH] Don't enter into argv[i]=="FULL_LINK" condition if argv[i]=="ONE_LINK" git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@9774 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- .../simdag/platforms/basic_parsing_test.c | 49 ++++++++++--------- 1 file changed, 25 insertions(+), 24 deletions(-) diff --git a/teshsuite/simdag/platforms/basic_parsing_test.c b/teshsuite/simdag/platforms/basic_parsing_test.c index ac610fc2b8..9b9a5be9d6 100644 --- a/teshsuite/simdag/platforms/basic_parsing_test.c +++ b/teshsuite/simdag/platforms/basic_parsing_test.c @@ -54,32 +54,33 @@ int main(int argc, char **argv) SD_route_get_current_latency(w1, w2), SD_route_get_current_bandwidth(w1, w2)); i=argc; - } - 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])); + }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)); + } } - printf("\tRoute latency = %f, route bandwidth = %f\n", - SD_route_get_current_latency(w1, w2), - SD_route_get_current_bandwidth(w1, w2)); + i=argc; } - } - i=argc; } } } -- 2.20.1