X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6760cb07d6b57be16928d95339d71e57c4e24f36..1c277fea0aed2cefb8ab1f53d911b565fafe4b3e:/examples/simdag/sd_test2.c diff --git a/examples/simdag/sd_test2.c b/examples/simdag/sd_test2.c index 9870e3c5ea..cc86f17543 100644 --- a/examples/simdag/sd_test2.c +++ b/examples/simdag/sd_test2.c @@ -25,7 +25,7 @@ static int nameCompareHosts(const void *n1, const void *n2) int main(int argc, char **argv) { int i, j; - SD_task_t *changed_tasks; + xbt_dynar_t changed_tasks; int n_hosts; const SD_workstation_t *hosts; SD_task_t taskInit; @@ -68,7 +68,8 @@ int main(int argc, char **argv) hosts = SD_workstation_get_list(); /* sorting hosts by hostname */ - qsort((void *) hosts, n_hosts, sizeof(SD_workstation_t), nameCompareHosts); + qsort((void *) hosts, n_hosts, sizeof(SD_workstation_t), + nameCompareHosts); /* creation of the tasks */ taskInit = SD_task_create("Initial", NULL, 1.0); @@ -176,11 +177,12 @@ int main(int argc, char **argv) /* scheduling the tasks */ - SD_task_schedule(taskInit, 1, hosts, SD_SCHED_NO_COST, SD_SCHED_NO_COST, -1.0); - SD_task_schedule(PtoPComm1, 2, PtoPcomm1_hosts, SD_SCHED_NO_COST, PtoPcomm1_table, - -1.0); - SD_task_schedule(PtoPComm2, 2, PtoPcomm2_hosts, SD_SCHED_NO_COST, PtoPcomm2_table, + SD_task_schedule(taskInit, 1, hosts, SD_SCHED_NO_COST, SD_SCHED_NO_COST, -1.0); + SD_task_schedule(PtoPComm1, 2, PtoPcomm1_hosts, SD_SCHED_NO_COST, + PtoPcomm1_table, -1.0); + SD_task_schedule(PtoPComm2, 2, PtoPcomm2_hosts, SD_SCHED_NO_COST, + PtoPcomm2_table, -1.0); SD_task_schedule(ParComp_wocomm, 5, ParComp_wocomm_hosts, ParComp_wocomm_cost, ParComp_wocomm_table, -1.0); SD_task_schedule(IntraRedist, 5, IntraRedist_hosts, IntraRedist_cost, @@ -191,12 +193,15 @@ int main(int argc, char **argv) InterRedist_table, -1.0); SD_task_schedule(ParComp_wcomm2, 5, ParComp_wcomm2_hosts, ParComp_wcomm2_cost, ParComp_wcomm2_table, -1.0); - SD_task_schedule(taskFinal, 1, &(hosts[9]), &final_cost, SD_SCHED_NO_COST, -1.0); + SD_task_schedule(taskFinal, 1, &(hosts[9]), &final_cost, + SD_SCHED_NO_COST, -1.0); /* let's launch the simulation! */ changed_tasks = SD_simulate(-1.0); - free(changed_tasks); + INFO1("Simulation time: %f", SD_get_clock()); + + xbt_dynar_free_container(&changed_tasks); free(ParComp_wocomm_table); free(IntraRedist_cost);