X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/056d48c9fa3d5fa5afd2be695f54edbc5fd5434d..b8df87e176f27b25534f27d7e240defa32ca35bc:/examples/simdag/goal/goal_test.c diff --git a/examples/simdag/goal/goal_test.c b/examples/simdag/goal/goal_test.c index a44b6ec05c..2c858011f8 100644 --- a/examples/simdag/goal/goal_test.c +++ b/examples/simdag/goal/goal_test.c @@ -1,11 +1,11 @@ -/* Example of scatter communication, accepting a large amount of processes. +/* Example of scatter communication, accepting a large amount of processes. * This based the experiment of Fig. 4 in http://hal.inria.fr/hal-00650233/ - * That experiment is a comparison to the LogOPSim simulator, that takes + * That experiment is a comparison to the LogOPSim simulator, that takes * GOAL files as an input, thus the file name. But there is no actual link * to the GOAL formalism beside of this. */ -/* Copyright (c) 2011-2015. The SimGrid Team. +/* Copyright (c) 2011-2019. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -65,12 +65,12 @@ int main(int argc, char **argv) { ws_list = sg_host_list(); reclaimed = xbt_dynar_new(sizeof(bcast_task_t),xbt_free_ref); - xbt_dynar_t done = NULL; + xbt_dynar_t done = xbt_dynar_new(sizeof(SD_task_t), NULL); xbt_os_cputimer_start(timer); send_one(0,sg_host_count()); do { - if (done != NULL && !xbt_dynar_is_empty(done)) { + if (!xbt_dynar_is_empty(done)) { unsigned int cursor; SD_task_t task; @@ -89,9 +89,9 @@ int main(int argc, char **argv) { } SD_task_destroy(task); } - xbt_dynar_free(&done); + xbt_dynar_free_container(&done); } - done=SD_simulate(-1); + SD_simulate_with_update(-1, done); } while(!xbt_dynar_is_empty(done)); xbt_os_cputimer_stop(timer); printf("exec_time:%f\n", xbt_os_timer_elapsed(timer) ); @@ -99,7 +99,6 @@ int main(int argc, char **argv) { xbt_dynar_free(&done); xbt_dynar_free(&reclaimed); - SD_exit(); XBT_INFO("Done. Bailing out"); return 0; }