X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2dc299653e83cf4ca5739a5d418dd8e51b80d6f6..fed4ee0e44358963b1d0c65f88b78f201b46f9f7:/src/simix/smx_global.c?ds=sidebyside diff --git a/src/simix/smx_global.c b/src/simix/smx_global.c index b3ba2f58fe..495736193e 100644 --- a/src/simix/smx_global.c +++ b/src/simix/smx_global.c @@ -66,8 +66,7 @@ void SIMIX_global_init(int *argc, char **argv) simix_global = xbt_new0(s_smx_global_t, 1); simix_global->host = xbt_dict_new(); - simix_global->process_to_run = - xbt_swag_new(xbt_swag_offset(proc, synchro_hookup)); + simix_global->process_to_run = xbt_dynar_new(sizeof(void *), NULL); simix_global->process_list = xbt_swag_new(xbt_swag_offset(proc, process_hookup)); simix_global->process_to_destroy = @@ -124,7 +123,7 @@ void SIMIX_clean(void) xbt_heap_free(simix_timers); /* Free the remaining data structures */ - xbt_swag_free(simix_global->process_to_run); + xbt_dynar_free(&simix_global->process_to_run); xbt_swag_free(simix_global->process_to_destroy); xbt_swag_free(simix_global->process_list); simix_global->process_list = NULL; @@ -180,13 +179,14 @@ void SIMIX_run(void) do { do { - DEBUG0("New Schedule Round"); + DEBUG1("New Schedule Round; size(queue)=%lu", + xbt_dynar_length(simix_global->process_to_run)); SIMIX_context_runall(simix_global->process_to_run); while ((req = SIMIX_request_pop())) { DEBUG1("Handling request %p", req); SIMIX_request_pre(req); } - } while (xbt_swag_size(simix_global->process_to_run)); + } while (xbt_dynar_length(simix_global->process_to_run)); time = surf_solve(SIMIX_timer_next());