X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4884b0d2c5f41831322abfb7c9d4dd74766cf7c4..a533429838a35ac04b4307c5509f32a0e8bce150:/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 76bd393a7e..8998c097a4 100644 --- a/teshsuite/simdag/platforms/basic_parsing_test.c +++ b/teshsuite/simdag/platforms/basic_parsing_test.c @@ -32,7 +32,7 @@ int main(int argc, char **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()); + SD_workstation_get_count(), sg_link_count()); if (argc >= 3) { if (!strcmp(argv[2], "ONE_LINK")) { @@ -48,17 +48,17 @@ int main(int argc, char **argv) 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])); + 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_current_latency(w1, w2), - SD_route_get_current_bandwidth(w1, w2)); + SD_route_get_latency(w1, w2), + SD_route_get_bandwidth(w1, w2)); } if (!strcmp(argv[2], "FULL_LINK")) { workstations = SD_workstation_get_list(); - list_size = SD_workstation_get_number(); + list_size = SD_workstation_get_count(); for (i = 0; i < list_size; i++) { w1 = workstations[i]; name1 = SD_workstation_get_name(w1); @@ -71,13 +71,13 @@ int main(int argc, char **argv) printf(" Route size %d\n", route_size); for (k = 0; k < route_size; k++) { printf(" Link %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])); + 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_current_latency(w1, w2), - SD_route_get_current_bandwidth(w1, w2)); + SD_route_get_latency(w1, w2), + SD_route_get_bandwidth(w1, w2)); } } }