X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/20bce0939a53dd9bb3c6ea68107e9529372db19b..faadab8061f6f30c378abc524b586b76381ef7c6:/src/simix/smx_global.c diff --git a/src/simix/smx_global.c b/src/simix/smx_global.c index b888675998..ed61f4f513 100644 --- a/src/simix/smx_global.c +++ b/src/simix/smx_global.c @@ -4,7 +4,7 @@ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ -#include "private.h" +#include "smx_private.h" #include "xbt/heap.h" #include "xbt/sysdep.h" #include "xbt/log.h" @@ -43,7 +43,7 @@ static void _XBT_CALL inthandler(int ignored) SIMIX_display_process_status(); } else { - XBT_INFO("CTRL-C pressed. bailing out without displaying because verbose-exit disabled"); + XBT_INFO("CTRL-C pressed. bailing out without displaying because verbose-exit is disabled"); } exit(1); } @@ -78,14 +78,15 @@ void SIMIX_global_init(int *argc, char **argv) simix_global = xbt_new0(s_smx_global_t, 1); - simix_global->process_to_run = xbt_dynar_new(sizeof(void *), NULL); + simix_global->process_to_run = xbt_dynar_new(sizeof(smx_process_t), NULL); + simix_global->process_that_ran = xbt_dynar_new(sizeof(smx_process_t), NULL); simix_global->process_list = xbt_swag_new(xbt_swag_offset(proc, process_hookup)); simix_global->process_to_destroy = xbt_swag_new(xbt_swag_offset(proc, destroy_hookup)); simix_global->maestro_process = NULL; - simix_global->registered_functions = xbt_dict_new(); + simix_global->registered_functions = xbt_dict_new_homogeneous(NULL); simix_global->create_process_function = SIMIX_process_create; simix_global->kill_process_function = SIMIX_process_kill; @@ -102,9 +103,6 @@ void SIMIX_global_init(int *argc, char **argv) __xbt_running_ctx_fetch = SIMIX_process_get_running_context; __xbt_ex_terminate = SIMIX_process_exception_terminate; - /* Initialize request mechanism */ - SIMIX_request_init(); - /* Initialize the SIMIX network module */ SIMIX_network_init(); @@ -136,12 +134,11 @@ void SIMIX_clean(void) /* Exit the SIMIX network module */ SIMIX_network_exit(); - /* Exit request mechanism */ - SIMIX_request_destroy(); - xbt_heap_free(simix_timers); + simix_timers = NULL; /* Free the remaining data structures */ xbt_dynar_free(&simix_global->process_to_run); + xbt_dynar_free(&simix_global->process_that_ran); xbt_swag_free(simix_global->process_to_destroy); xbt_swag_free(simix_global->process_list); simix_global->process_list = NULL; @@ -188,7 +185,7 @@ XBT_INLINE double SIMIX_get_clock(void) void SIMIX_run(void) { double time = 0; - smx_req_t req; + smx_process_t process; xbt_swag_t set; surf_action_t action; smx_timer_t timer; @@ -201,17 +198,20 @@ void SIMIX_run(void) #ifdef TIME_BENCH smx_ctx_raw_new_sr(); #endif - do { + while (!xbt_dynar_is_empty(simix_global->process_to_run)) { XBT_DEBUG("New Sub-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())) { - XBT_DEBUG("Handling request %p", req); - SIMIX_request_pre(req, 0); + SIMIX_process_runall(); + xbt_dynar_foreach(simix_global->process_that_ran, iter, process) { + if (process->simcall.call != SIMCALL_NONE) { + SIMIX_simcall_pre(&process->simcall, 0); + } } - } while (xbt_dynar_length(simix_global->process_to_run)); + } - time = surf_solve(SIMIX_timer_next()); + time = SIMIX_timer_next(); + if (time != -1.0 || xbt_swag_size(simix_global->process_list) != 0) + time = surf_solve(time); /* Notify all the hosts that have failed */ /* FIXME: iterate through the list of failed host and mark each of them */ @@ -225,21 +225,27 @@ void SIMIX_run(void) if (timer->func) ((void (*)(void*))timer->func)(timer->args); } - /* Wake up all process waiting for the action finish */ + /* Wake up all processes waiting for a Surf action to finish */ xbt_dynar_foreach(model_list, iter, model) { - for (set = model->states.failed_action_set; - set; - set = (set == model->states.failed_action_set) - ? model->states.done_action_set - : NULL) { - while ((action = xbt_swag_extract(set))) - SIMIX_request_post((smx_action_t) action->data); - } + set = model->states.failed_action_set; + while ((action = xbt_swag_extract(set))) + SIMIX_simcall_post((smx_action_t) action->data); + set = model->states.done_action_set; + while ((action = xbt_swag_extract(set))) + SIMIX_simcall_post((smx_action_t) action->data); } - } while (time != -1.0); + + /* Clean processes to destroy */ + SIMIX_process_empty_trash(); + + } while (time != -1.0 || !xbt_dynar_is_empty(simix_global->process_to_run)); if (xbt_swag_size(simix_global->process_list) != 0) { +#ifdef HAVE_TRACING + TRACE_end(); +#endif + XBT_WARN("Oops ! Deadlock or code not perfectly clean."); SIMIX_display_process_status(); xbt_abort(); @@ -320,7 +326,7 @@ void SIMIX_display_process_status(void) XBT_INFO("%d processes are still running, waiting for something.", nbprocess); /* List the process and their state */ XBT_INFO - ("Legend of the following listing: \" on : .\""); + ("Legend of the following listing: \"Process (@): \""); xbt_swag_foreach(process, simix_global->process_list) { if (process->waiting_action) { @@ -328,51 +334,57 @@ void SIMIX_display_process_status(void) const char* action_description = "unknown"; switch (process->waiting_action->type) { - case SIMIX_ACTION_EXECUTE: - action_description = "execution"; - break; + case SIMIX_ACTION_EXECUTE: + action_description = "execution"; + break; - case SIMIX_ACTION_PARALLEL_EXECUTE: - action_description = "parallel execution"; - break; + case SIMIX_ACTION_PARALLEL_EXECUTE: + action_description = "parallel execution"; + break; - case SIMIX_ACTION_COMMUNICATE: - action_description = "communication"; - break; + case SIMIX_ACTION_COMMUNICATE: + action_description = "communication"; + break; - case SIMIX_ACTION_SLEEP: - action_description = "sleeping"; - break; + case SIMIX_ACTION_SLEEP: + action_description = "sleeping"; + break; - case SIMIX_ACTION_SYNCHRO: - action_description = "synchronization"; - break; + case SIMIX_ACTION_SYNCHRO: + action_description = "synchronization"; + break; - case SIMIX_ACTION_IO: - action_description = "I/O"; - break; + case SIMIX_ACTION_IO: + action_description = "I/O"; + break; } - XBT_INFO("Waiting for %s action %p to finish", action_description, process->waiting_action); + XBT_INFO("Process %lu (%s@%s): waiting for %s action %p (%s) in state %d to finish", + process->pid, process->name, process->smx_host->name, + action_description, process->waiting_action, + process->waiting_action->name, (int)process->waiting_action->state); + } + else { + XBT_INFO("Process %lu (%s@%s)", process->pid, process->name, process->smx_host->name); } } } static void* SIMIX_action_mallocator_new_f(void) { smx_action_t action = xbt_new(s_smx_action_t, 1); - action->request_list = xbt_fifo_new(); + action->simcalls = xbt_fifo_new(); return action; } static void SIMIX_action_mallocator_free_f(void* action) { - xbt_fifo_free(((smx_action_t) action)->request_list); + xbt_fifo_free(((smx_action_t) action)->simcalls); xbt_free(action); } static void SIMIX_action_mallocator_reset_f(void* action) { - // we also recycle the request list - xbt_fifo_t fifo = ((smx_action_t) action)->request_list; + // we also recycle the simcall list + xbt_fifo_t fifo = ((smx_action_t) action)->simcalls; xbt_fifo_reset(fifo); memset(action, 0, sizeof(s_smx_action_t)); - ((smx_action_t) action)->request_list = fifo; + ((smx_action_t) action)->simcalls = fifo; }