X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0f30f0953fccaf152a09af12d3d9091ab5a687af..1c277fea0aed2cefb8ab1f53d911b565fafe4b3e:/examples/simdag/sd_test.c diff --git a/examples/simdag/sd_test.c b/examples/simdag/sd_test.c index e5bf6d4b08..886f80b5e8 100644 --- a/examples/simdag/sd_test.c +++ b/examples/simdag/sd_test.c @@ -16,6 +16,7 @@ XBT_LOG_NEW_DEFAULT_CATEGORY(sd_test, int main(int argc, char **argv) { int i; + unsigned int ctr; const char *platform_file; const SD_workstation_t *workstations; const char *name1; @@ -62,17 +63,20 @@ int main(int argc, char **argv) computation_amount2 = 1000000; communication_amount12 = 2000000; communication_amount21 = 3000000; - INFO3("Computation time for %f flops on %s: %f", computation_amount1, name1, - SD_workstation_get_computation_time(w1, computation_amount1)); - INFO3("Computation time for %f flops on %s: %f", computation_amount2, name2, - SD_workstation_get_computation_time(w2, computation_amount2)); + INFO3("Computation time for %f flops on %s: %f", computation_amount1, + name1, SD_workstation_get_computation_time(w1, + computation_amount1)); + INFO3("Computation time for %f flops on %s: %f", computation_amount2, + name2, SD_workstation_get_computation_time(w2, + computation_amount2)); INFO2("Route between %s and %s:", name1, name2); route = SD_route_get_list(w1, w2); route_size = SD_route_get_size(w1, w2); for (i = 0; i < route_size; i++) { INFO3(" Link %s: latency = %f, bandwidth = %f", - SD_link_get_name(route[i]), SD_link_get_current_latency(route[i]), + SD_link_get_name(route[i]), + SD_link_get_current_latency(route[i]), SD_link_get_current_bandwidth(route[i])); } INFO2("Route latency = %f, route bandwidth = %f", @@ -161,8 +165,9 @@ int main(int argc, char **argv) /* estimated time */ task = taskD; INFO2("Estimated time for '%s': %f", SD_task_get_name(task), - SD_task_get_execution_time(task, workstation_number, workstation_list, - computation_amount, communication_amount)); + SD_task_get_execution_time(task, workstation_number, + workstation_list, computation_amount, + communication_amount)); /* let's launch the simulation! */ @@ -176,11 +181,10 @@ int main(int argc, char **argv) computation_amount, communication_amount, rate); changed_tasks = SD_simulate(-1.0); - xbt_dynar_foreach(changed_tasks, i, task){ - INFO3("Task '%s' start time: %f, finish time: %f", + xbt_dynar_foreach(changed_tasks, ctr, task) { + INFO3("Task '%s' start time: %f, finish time: %f", SD_task_get_name(task), - SD_task_get_start_time(task), - SD_task_get_finish_time(task)); + SD_task_get_start_time(task), SD_task_get_finish_time(task)); } xbt_dynar_get_cpy(changed_tasks, 0, &checkD);