From 1d9f7ca4e560831514247ff477a861871ba91eb6 Mon Sep 17 00:00:00 2001 From: Frederic Suter Date: Thu, 14 Jan 2016 12:09:47 +0100 Subject: [PATCH] Modify almost all SD tests. There is no need to free a structure allocated by SD_Simulate in user code. --- examples/simdag/dax/dax_test.c | 5 ++--- examples/simdag/scheduling/minmin_test.c | 7 ++----- examples/simdag/sd_avail.c | 2 -- examples/simdag/sd_comm_throttling.c | 2 -- examples/simdag/sd_fail.c | 13 ++++--------- examples/simdag/sd_seq_access.c | 5 +---- examples/simdag/sd_test.c | 2 -- examples/simdag/sd_test2.c | 4 +--- examples/simdag/simdag_trace.c | 2 -- teshsuite/simdag/availability/availability_test.c | 3 +-- teshsuite/simdag/basic/basic0.c | 6 ++---- teshsuite/simdag/basic/basic1.c | 4 +--- teshsuite/simdag/basic/basic2.c | 4 +--- teshsuite/simdag/basic/basic3.c | 4 +--- teshsuite/simdag/basic/basic4.c | 4 +--- teshsuite/simdag/basic/basic5.c | 4 +--- teshsuite/simdag/basic/basic6.c | 3 +-- teshsuite/simdag/network/mxn/test_intra_all2all.c | 4 +--- .../network/mxn/test_intra_independent_comm.c | 4 +--- teshsuite/simdag/network/p2p/test_latency1.c | 4 +--- teshsuite/simdag/network/p2p/test_latency2.c | 4 +--- teshsuite/simdag/network/p2p/test_latency3.c | 4 +--- teshsuite/simdag/network/p2p/test_latency_bound.c | 4 +--- 23 files changed, 25 insertions(+), 73 deletions(-) diff --git a/examples/simdag/dax/dax_test.c b/examples/simdag/dax/dax_test.c index 91690206cd..6bc8f25538 100644 --- a/examples/simdag/dax/dax_test.c +++ b/examples/simdag/dax/dax_test.c @@ -27,7 +27,7 @@ static int name_compare_hosts(const void *n1, const void *n2) int main(int argc, char **argv) { - xbt_dynar_t dax, changed; + xbt_dynar_t dax; unsigned int cursor; SD_task_t task; @@ -100,8 +100,7 @@ int main(int argc, char **argv) XBT_INFO ("------------------- Run the schedule ---------------------------"); - changed = SD_simulate(-1); - xbt_dynar_free_container(&changed); + SD_simulate(-1); XBT_INFO ("------------------- Produce the trace file---------------------------"); XBT_INFO("Producing the trace of the run into %s", tracefilename); diff --git a/examples/simdag/scheduling/minmin_test.c b/examples/simdag/scheduling/minmin_test.c index edf703aeb1..5f1c3a6867 100644 --- a/examples/simdag/scheduling/minmin_test.c +++ b/examples/simdag/scheduling/minmin_test.c @@ -254,7 +254,7 @@ int main(int argc, char **argv) SD_workstation_t workstation, selected_workstation = NULL; int total_nworkstations = 0; const SD_workstation_t *workstations = NULL; - xbt_dynar_t dax, changed; + xbt_dynar_t dax; FILE *out = NULL; /* initialization of SD */ @@ -303,12 +303,11 @@ int main(int argc, char **argv) workstation = SD_task_get_best_workstation(task); SD_task_schedulel(task, 1, workstation); - while (!xbt_dynar_is_empty((changed = SD_simulate(-1.0)))) { + while (!xbt_dynar_is_empty(SD_simulate(-1.0))) { /* Get the set of ready tasks */ ready_tasks = get_ready_tasks(dax); if (xbt_dynar_is_empty(ready_tasks)) { xbt_dynar_free_container(&ready_tasks); - xbt_dynar_free_container(&changed); /* there is no ready task, let advance the simulation */ continue; } @@ -362,7 +361,6 @@ int main(int argc, char **argv) xbt_dynar_free_container(&ready_tasks); /* reset the min_finish_time for the next set of ready tasks */ min_finish_time = -1.; - xbt_dynar_free_container(&changed); } XBT_INFO("Simulation Time: %f", SD_get_clock()); @@ -383,7 +381,6 @@ int main(int argc, char **argv) xbt_dynar_free_container(&ready_tasks); - xbt_dynar_free_container(&changed); xbt_dynar_foreach(dax, cursor, task) { SD_task_destroy(task); diff --git a/examples/simdag/sd_avail.c b/examples/simdag/sd_avail.c index 17bed9fc0a..231a78064e 100644 --- a/examples/simdag/sd_avail.c +++ b/examples/simdag/sd_avail.c @@ -102,9 +102,7 @@ int main(int argc, char **argv) if (SD_task_get_state(task)==SD_DONE) SD_task_destroy(task); } - xbt_dynar_free_container(&changed_tasks); } - xbt_dynar_free_container(&changed_tasks); SD_exit(); return 0; } diff --git a/examples/simdag/sd_comm_throttling.c b/examples/simdag/sd_comm_throttling.c index e16158cf83..2b630631b9 100644 --- a/examples/simdag/sd_comm_throttling.c +++ b/examples/simdag/sd_comm_throttling.c @@ -79,9 +79,7 @@ int main(int argc, char **argv) */ if (SD_task_get_state(taskC) == SD_DONE && SD_task_get_state(taskD) < SD_RUNNING) SD_task_set_rate(taskD, 6.25); - xbt_dynar_free_container(&changed_tasks); } - xbt_dynar_free_container(&changed_tasks); XBT_DEBUG("Destroying tasks..."); diff --git a/examples/simdag/sd_fail.c b/examples/simdag/sd_fail.c index f8f29cf8fc..39d85d344a 100644 --- a/examples/simdag/sd_fail.c +++ b/examples/simdag/sd_fail.c @@ -19,7 +19,6 @@ int main(int argc, char **argv) double computation_amount[1]; double communication_amount[2] = { 0 }; SD_workstation_t workstation_list[1]; - xbt_dynar_t ret; /* initialization of SD */ SD_init(&argc, argv); @@ -39,8 +38,7 @@ int main(int argc, char **argv) SD_task_schedulel(task, 1, SD_workstation_get_by_name("Faulty Host")); - ret = SD_simulate(-1.0); - xbt_dynar_free(&ret); + SD_simulate(-1.0); SD_task_dump(task); @@ -54,8 +52,7 @@ int main(int argc, char **argv) SD_task_schedulel(task, 1, SD_workstation_get_by_name("Safe Host")); XBT_INFO("Run the simulation again"); - ret = SD_simulate(-1.0); - xbt_dynar_free(&ret); + SD_simulate(-1.0); SD_task_dump(task); XBT_INFO("Task '%s' start time: %f, finish time: %f", @@ -81,8 +78,7 @@ int main(int argc, char **argv) SD_task_schedule(task, 1, workstation_list, computation_amount, communication_amount,-1); - ret = SD_simulate(-1.0); - xbt_dynar_free(&ret); + SD_simulate(-1.0); SD_task_dump(task); @@ -100,8 +96,7 @@ int main(int argc, char **argv) computation_amount, communication_amount,-1); XBT_INFO("Run the simulation again"); - ret = SD_simulate(-1.0); - xbt_dynar_free(&ret); + SD_simulate(-1.0); SD_task_dump(task); XBT_INFO("Task '%s' start time: %f, finish time: %f", diff --git a/examples/simdag/sd_seq_access.c b/examples/simdag/sd_seq_access.c index e5e947d550..4314ad6d4d 100644 --- a/examples/simdag/sd_seq_access.c +++ b/examples/simdag/sd_seq_access.c @@ -19,7 +19,6 @@ int main(int argc, char **argv) const char *platform_file; const SD_workstation_t *workstations; SD_task_t taskA, taskB, taskC, taskD; - xbt_dynar_t changed_tasks; /* initialization of SD */ SD_init(&argc, argv); @@ -80,14 +79,12 @@ int main(int argc, char **argv) SD_task_schedulel(taskD, 1, workstations[1]); /* let's launch the simulation! */ - while (!xbt_dynar_is_empty(changed_tasks = SD_simulate(-1.0))) { + while (!xbt_dynar_is_empty(SD_simulate(-1.0))) { XBT_INFO(" Simulation was suspended, check workstation states"); for (i = 0; i < 2; i++) { SD_workstation_dump(workstations[i]); } - xbt_dynar_free(&changed_tasks); } - xbt_dynar_free(&changed_tasks); XBT_DEBUG("Destroying tasks..."); diff --git a/examples/simdag/sd_test.c b/examples/simdag/sd_test.c index caeee55188..0f4220f510 100644 --- a/examples/simdag/sd_test.c +++ b/examples/simdag/sd_test.c @@ -197,8 +197,6 @@ int main(int argc, char **argv) xbt_assert(checkD == taskD && checkB == taskB, "Unexpected simulation results"); - xbt_dynar_free_container(&changed_tasks); - XBT_DEBUG("Destroying tasks..."); SD_task_destroy(taskA); diff --git a/examples/simdag/sd_test2.c b/examples/simdag/sd_test2.c index 9342bd82ed..aaa60fdfa1 100644 --- a/examples/simdag/sd_test2.c +++ b/examples/simdag/sd_test2.c @@ -25,7 +25,6 @@ static int nameCompareHosts(const void *n1, const void *n2) int main(int argc, char **argv) { int i, j; - xbt_dynar_t changed_tasks; int n_hosts; const SD_workstation_t *hosts; SD_task_t taskInit; @@ -201,11 +200,10 @@ int main(int argc, char **argv) SD_SCHED_NO_COST, -1.0); /* let's launch the simulation! */ - changed_tasks = SD_simulate(-1.0); + SD_simulate(-1.0); XBT_INFO("Simulation time: %f", SD_get_clock()); - xbt_dynar_free_container(&changed_tasks); free(ParComp_wocomm_table); free(IntraRedist_cost); diff --git a/examples/simdag/simdag_trace.c b/examples/simdag/simdag_trace.c index cc2eabbbbf..72fb7980b6 100644 --- a/examples/simdag/simdag_trace.c +++ b/examples/simdag/simdag_trace.c @@ -122,9 +122,7 @@ int main(int argc, char **argv) XBT_ERROR("Shouldn't be here"); } } - xbt_dynar_free_container(&changed_tasks); } - xbt_dynar_free_container(&changed_tasks); XBT_DEBUG("Destroying tasks..."); diff --git a/teshsuite/simdag/availability/availability_test.c b/teshsuite/simdag/availability/availability_test.c index 148bd86093..d4fd48f330 100644 --- a/teshsuite/simdag/availability/availability_test.c +++ b/teshsuite/simdag/availability/availability_test.c @@ -144,8 +144,7 @@ static xbt_dynar_t initDynamicThrottling(int *argc, char *argv[]) fprintf(stdout, "Scheduling DAX...\n"); scheduleDAX(dax); fprintf(stdout, "DAX scheduled\n"); - xbt_dynar_t ret = SD_simulate(-1); - xbt_dynar_free(&ret); + SD_simulate(-1); fprintf(stdout, "Simulation end. Time: %f\n", SD_get_clock()); return dax; diff --git a/teshsuite/simdag/basic/basic0.c b/teshsuite/simdag/basic/basic0.c index 7389e3ae73..65efcbc2de 100644 --- a/teshsuite/simdag/basic/basic0.c +++ b/teshsuite/simdag/basic/basic0.c @@ -28,8 +28,7 @@ int main(int argc, char **argv) SD_task_t taskInit; SD_task_t taskA; SD_task_t taskB; - xbt_dynar_t ret; - + /* scheduling parameters */ double communication_amount1[] = { 0, 1e8, 0, 0 }; @@ -59,8 +58,7 @@ int main(int argc, char **argv) SD_task_dependency_add(NULL, NULL, taskInit, taskA); SD_task_dependency_add(NULL, NULL, taskInit, taskB); - ret = SD_simulate(-1.0); - xbt_dynar_free(&ret); + SD_simulate(-1.0); SD_task_destroy(taskInit); SD_task_destroy(taskA); SD_task_destroy(taskB); diff --git a/teshsuite/simdag/basic/basic1.c b/teshsuite/simdag/basic/basic1.c index bb37331780..3b965ea3dc 100644 --- a/teshsuite/simdag/basic/basic1.c +++ b/teshsuite/simdag/basic/basic1.c @@ -27,7 +27,6 @@ int main(int argc, char **argv) SD_task_t taskInit; SD_task_t taskA; SD_task_t taskB; - xbt_dynar_t ret; double communication_amount1 = 1e9; double communication_amount2 = 1e9; @@ -63,8 +62,7 @@ int main(int argc, char **argv) SD_task_dependency_add(NULL, NULL, taskInit, taskA); SD_task_dependency_add(NULL, NULL, taskInit, taskB); - ret = SD_simulate(-1.0); - xbt_dynar_free(&ret); + SD_simulate(-1.0); SD_task_destroy(taskA); SD_task_destroy(taskB); SD_task_destroy(taskInit); diff --git a/teshsuite/simdag/basic/basic2.c b/teshsuite/simdag/basic/basic2.c index 3ec41b4176..032fbe1098 100644 --- a/teshsuite/simdag/basic/basic2.c +++ b/teshsuite/simdag/basic/basic2.c @@ -27,7 +27,6 @@ int main(int argc, char **argv) SD_task_t taskInit; SD_task_t taskA; SD_task_t taskB; - xbt_dynar_t ret; const SD_workstation_t *workstation; @@ -62,8 +61,7 @@ int main(int argc, char **argv) SD_task_dependency_add(NULL, NULL, taskInit, taskA); SD_task_dependency_add(NULL, NULL, taskInit, taskB); - ret = SD_simulate(-1.0); - xbt_dynar_free(&ret); + SD_simulate(-1.0); SD_task_destroy(taskA); SD_task_destroy(taskB); SD_task_destroy(taskInit); diff --git a/teshsuite/simdag/basic/basic3.c b/teshsuite/simdag/basic/basic3.c index 73444db114..1e288c56de 100644 --- a/teshsuite/simdag/basic/basic3.c +++ b/teshsuite/simdag/basic/basic3.c @@ -22,7 +22,6 @@ int main(int argc, char **argv) SD_task_t taskInit; SD_task_t taskA; SD_task_t taskFin; - xbt_dynar_t ret; /* scheduling parameters */ @@ -50,8 +49,7 @@ int main(int argc, char **argv) SD_task_dependency_add(NULL, NULL, taskInit, taskA); SD_task_dependency_add(NULL, NULL, taskA, taskFin); - ret = SD_simulate(-1.0); - xbt_dynar_free(&ret); + SD_simulate(-1.0); SD_task_destroy(taskInit); SD_task_destroy(taskA); SD_task_destroy(taskFin); diff --git a/teshsuite/simdag/basic/basic4.c b/teshsuite/simdag/basic/basic4.c index 3861477333..fcfbb915a0 100644 --- a/teshsuite/simdag/basic/basic4.c +++ b/teshsuite/simdag/basic/basic4.c @@ -25,7 +25,6 @@ int main(int argc, char **argv) SD_task_t taskInit; SD_task_t taskA; SD_task_t taskFin; - xbt_dynar_t ret; /* scheduling parameters */ @@ -55,8 +54,7 @@ int main(int argc, char **argv) SD_task_dependency_add(NULL, NULL, taskInit, taskA); SD_task_dependency_add(NULL, NULL, taskA, taskFin); - ret = SD_simulate(-1.0); - xbt_dynar_free(&ret); + SD_simulate(-1.0); SD_task_destroy(taskInit); SD_task_destroy(taskA); SD_task_destroy(taskFin); diff --git a/teshsuite/simdag/basic/basic5.c b/teshsuite/simdag/basic/basic5.c index 41eb21f35c..1d60d95cf8 100644 --- a/teshsuite/simdag/basic/basic5.c +++ b/teshsuite/simdag/basic/basic5.c @@ -27,7 +27,6 @@ int main(int argc, char **argv) SD_task_t taskInit; SD_task_t taskA; SD_task_t taskB; - xbt_dynar_t ret; /* scheduling parameters */ @@ -57,8 +56,7 @@ int main(int argc, char **argv) SD_task_dependency_add(NULL, NULL, taskInit, taskA); SD_task_dependency_add(NULL, NULL, taskInit, taskB); - ret = SD_simulate(-1.0); - xbt_dynar_free(&ret); + SD_simulate(-1.0); SD_task_destroy(taskInit); SD_task_destroy(taskA); SD_task_destroy(taskB); diff --git a/teshsuite/simdag/basic/basic6.c b/teshsuite/simdag/basic/basic6.c index 3c40d9d9d7..e02c47b645 100644 --- a/teshsuite/simdag/basic/basic6.c +++ b/teshsuite/simdag/basic/basic6.c @@ -42,9 +42,8 @@ int main(int argc, char **argv) ret = SD_simulate(-1.0); xbt_assert(xbt_dynar_length(ret) == 2, - "I was expecting the terminaison of 2 tasks, but I got %lu instead", + "I was expecting the completion of 2 tasks, but I got %lu instead", xbt_dynar_length(ret)); - xbt_dynar_free(&ret); SD_task_destroy(taskA); SD_task_destroy(taskB); diff --git a/teshsuite/simdag/network/mxn/test_intra_all2all.c b/teshsuite/simdag/network/mxn/test_intra_all2all.c index bb64cf39ee..d5b56d31e7 100644 --- a/teshsuite/simdag/network/mxn/test_intra_all2all.c +++ b/teshsuite/simdag/network/mxn/test_intra_all2all.c @@ -25,7 +25,6 @@ int main(int argc, char **argv) { double time; SD_task_t task; - xbt_dynar_t ret; double communication_amount[] = { 0.0, 1.0, 1.0, 1.0, 1.0, 0.0, 1.0, 1.0, @@ -46,8 +45,7 @@ int main(int argc, char **argv) SD_task_schedule(task, 4, SD_workstation_get_list(), no_cost, communication_amount, -1.0); - ret = SD_simulate(-1.0); - xbt_dynar_free(&ret); + SD_simulate(-1.0); time = SD_get_clock(); diff --git a/teshsuite/simdag/network/mxn/test_intra_independent_comm.c b/teshsuite/simdag/network/mxn/test_intra_independent_comm.c index a461e51ec9..18b8d9d2ba 100644 --- a/teshsuite/simdag/network/mxn/test_intra_independent_comm.c +++ b/teshsuite/simdag/network/mxn/test_intra_independent_comm.c @@ -25,7 +25,6 @@ int main(int argc, char **argv) { double time; SD_task_t task; - xbt_dynar_t ret; double communication_amount[] = { 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, @@ -46,8 +45,7 @@ int main(int argc, char **argv) SD_task_schedule(task, 4, SD_workstation_get_list(), no_cost, communication_amount, -1.0); - ret = SD_simulate(-1.0); - xbt_dynar_free(&ret); + SD_simulate(-1.0); time = SD_get_clock(); diff --git a/teshsuite/simdag/network/p2p/test_latency1.c b/teshsuite/simdag/network/p2p/test_latency1.c index 21e93e3e1a..7116e60d90 100644 --- a/teshsuite/simdag/network/p2p/test_latency1.c +++ b/teshsuite/simdag/network/p2p/test_latency1.c @@ -25,7 +25,6 @@ int main(int argc, char **argv) double communication_amount[] = { 0.0, 1.0, 0.0, 0.0 }; const double no_cost[] = { 0.0, 0.0 }; SD_task_t task; - xbt_dynar_t ret; SD_init(&argc, argv); SD_create_environment(argv[1]); @@ -35,8 +34,7 @@ int main(int argc, char **argv) SD_task_schedule(task, 2, SD_workstation_get_list(), no_cost, communication_amount, -1.0); - ret = SD_simulate(-1.0); - xbt_dynar_free(&ret); + SD_simulate(-1.0); time = SD_get_clock(); diff --git a/teshsuite/simdag/network/p2p/test_latency2.c b/teshsuite/simdag/network/p2p/test_latency2.c index 81fa7bb8fa..608b0be7a1 100644 --- a/teshsuite/simdag/network/p2p/test_latency2.c +++ b/teshsuite/simdag/network/p2p/test_latency2.c @@ -28,7 +28,6 @@ int main(int argc, char **argv) double communication_amount2[] = { 0.0, 1.0, 0.0, 0.0 }; double no_cost1[] = { 0.0 }; double no_cost[] = { 0.0, 0.0 }; - xbt_dynar_t ret; SD_init(&argc, argv); SD_create_environment(argv[1]); @@ -47,8 +46,7 @@ int main(int argc, char **argv) SD_task_dependency_add(NULL, NULL, root, task1); SD_task_dependency_add(NULL, NULL, root, task2); - ret = SD_simulate(-1.0); - xbt_dynar_free(&ret); + SD_simulate(-1.0); time = SD_get_clock(); diff --git a/teshsuite/simdag/network/p2p/test_latency3.c b/teshsuite/simdag/network/p2p/test_latency3.c index 23df782802..fb26ed9d4e 100644 --- a/teshsuite/simdag/network/p2p/test_latency3.c +++ b/teshsuite/simdag/network/p2p/test_latency3.c @@ -29,7 +29,6 @@ int main(int argc, char **argv) double communication_amount2[] = { 0.0, 0.0, 1.0, 0.0 }; double no_cost1[] = { 0.0 }; double no_cost[] = { 0.0, 0.0 }; - xbt_dynar_t ret; SD_init(&argc, argv); SD_create_environment(argv[1]); @@ -48,8 +47,7 @@ int main(int argc, char **argv) SD_task_dependency_add(NULL, NULL, root, task1); SD_task_dependency_add(NULL, NULL, root, task2); - ret = SD_simulate(-1.0); - xbt_dynar_free(&ret); + SD_simulate(-1.0); time = SD_get_clock(); diff --git a/teshsuite/simdag/network/p2p/test_latency_bound.c b/teshsuite/simdag/network/p2p/test_latency_bound.c index 2c74f788b8..0563bed42a 100644 --- a/teshsuite/simdag/network/p2p/test_latency_bound.c +++ b/teshsuite/simdag/network/p2p/test_latency_bound.c @@ -29,7 +29,6 @@ int main(int argc, char **argv) double time; double communication_amount[] = { 0.0, 1.0, 0.0, 0.0 }; double no_cost[] = { 0.0, 0.0 }; - xbt_dynar_t ret; SD_task_t root; SD_task_t task[TASK_NUM]; @@ -50,8 +49,7 @@ int main(int argc, char **argv) SD_task_dependency_add(NULL, NULL, root, task[i]); } - ret = SD_simulate(-1.0); - xbt_dynar_free(&ret); + SD_simulate(-1.0); time = SD_get_clock(); -- 2.20.1