X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7a25b8e6a7aae6d40849189e58495aee0d8f726f..0398e492623cdd79abef6beb6819fda9d01b39c9:/src/simix/smx_global.c diff --git a/src/simix/smx_global.c b/src/simix/smx_global.c index d0e2c53314..24f9df4311 100644 --- a/src/simix/smx_global.c +++ b/src/simix/smx_global.c @@ -10,6 +10,7 @@ #include "xbt/log.h" #include "xbt/str.h" #include "xbt/ex.h" /* ex_backtrace_display */ +#include "mc/mc.h" XBT_LOG_EXTERNAL_CATEGORY(simix); XBT_LOG_EXTERNAL_CATEGORY(simix_action); @@ -25,13 +26,25 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_kernel, simix, smx_global_t simix_global = NULL; static xbt_heap_t simix_timers = NULL; +static void* SIMIX_action_mallocator_new_f(void); +static void SIMIX_action_mallocator_free_f(void* action); +static void SIMIX_action_mallocator_reset_f(void* action); + +extern void smx_ctx_raw_new_sr(void); + /* FIXME: Yeah, I'll do it in a portable maner one day [Mt] */ #include +int _surf_do_verbose_exit = 1; static void _XBT_CALL inthandler(int ignored) { - INFO0("CTRL-C pressed. Displaying status and bailing out"); - SIMIX_display_process_status(); + if ( _surf_do_verbose_exit ) { + XBT_INFO("CTRL-C pressed. Displaying status and bailing out"); + SIMIX_display_process_status(); + } + else { + XBT_INFO("CTRL-C pressed. bailing out without displaying because verbose-exit disabled"); + } exit(1); } @@ -65,8 +78,8 @@ 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_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 = @@ -75,9 +88,12 @@ void SIMIX_global_init(int *argc, char **argv) simix_global->maestro_process = NULL; simix_global->registered_functions = xbt_dict_new(); - simix_global->create_process_function = NULL; - simix_global->kill_process_function = NULL; + simix_global->create_process_function = SIMIX_process_create; + simix_global->kill_process_function = SIMIX_process_kill; simix_global->cleanup_process_function = SIMIX_process_cleanup; + simix_global->action_mallocator = xbt_mallocator_new(65536, + SIMIX_action_mallocator_new_f, SIMIX_action_mallocator_free_f, + SIMIX_action_mallocator_reset_f); surf_init(argc, argv); /* Initialize SURF structures */ SIMIX_context_mod_init(); @@ -87,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(); @@ -99,6 +112,9 @@ void SIMIX_global_init(int *argc, char **argv) if (!simix_timers) { simix_timers = xbt_heap_new(8, &free); } + + XBT_DEBUG("ADD SIMIX LEVELS"); + SIMIX_HOST_LEVEL = xbt_lib_add_level(host_lib,SIMIX_host_destroy); } /** @@ -108,24 +124,25 @@ void SIMIX_global_init(int *argc, char **argv) */ void SIMIX_clean(void) { +#ifdef TIME_BENCH + smx_ctx_raw_new_sr(); +#endif + /* Kill everyone (except maestro) */ - SIMIX_process_killall(); + SIMIX_process_killall(simix_global->maestro_process); /* Exit the SIMIX network module */ SIMIX_network_exit(); - /* Exit request mechanism */ - SIMIX_request_destroy(); - xbt_heap_free(simix_timers); /* 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; simix_global->process_to_destroy = NULL; xbt_dict_free(&(simix_global->registered_functions)); - xbt_dict_free(&(simix_global->host)); /* Let's free maestro now */ SIMIX_context_free(simix_global->maestro_process->context); @@ -142,6 +159,7 @@ void SIMIX_clean(void) surf_exit(); + xbt_mallocator_free(simix_global->action_mallocator); xbt_free(simix_global); simix_global = NULL; @@ -156,13 +174,17 @@ void SIMIX_clean(void) */ XBT_INLINE double SIMIX_get_clock(void) { - return surf_get_clock(); + if(MC_IS_ENABLED){ + return MC_process_clock_get(SIMIX_process_self()); + }else{ + return surf_get_clock(); + } } 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; @@ -170,17 +192,26 @@ void SIMIX_run(void) unsigned int iter; do { - do { - 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, 0); + XBT_DEBUG("New Schedule Round; size(queue)=%lu", + xbt_dynar_length(simix_global->process_to_run)); +#ifdef TIME_BENCH + smx_ctx_raw_new_sr(); +#endif + while (xbt_dynar_length(simix_global->process_to_run)) { + XBT_DEBUG("New Sub-Schedule Round; size(queue)=%lu", + xbt_dynar_length(simix_global->process_to_run)); + SIMIX_process_runall(); + xbt_dynar_foreach(simix_global->process_that_ran, iter, process) { + if (process->request.call != REQ_NO_REQ) { + XBT_DEBUG("Handling request %p", &process->request); + SIMIX_request_pre(&process->request, 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 */ @@ -205,11 +236,19 @@ void SIMIX_run(void) SIMIX_request_post((smx_action_t) action->data); } } - } while (time != -1.0); + + /* Clean processes to destroy */ + SIMIX_process_empty_trash(); + + } while (time != -1.0 || xbt_dynar_length(simix_global->process_to_run) > 0); if (xbt_swag_size(simix_global->process_list) != 0) { - WARN0("Oops ! Deadlock or code not perfectly clean."); +#ifdef HAVE_TRACING + TRACE_end(); +#endif + + XBT_WARN("Oops ! Deadlock or code not perfectly clean."); SIMIX_display_process_status(); xbt_abort(); } @@ -235,43 +274,40 @@ XBT_INLINE void SIMIX_timer_set(double date, void *function, void *arg) } /** - * \brief Registers a function to create a process. - * - * This function registers an user function to be called when a new process is created. The user function have to call the SIMIX_create_process function. - * \param function Create process function + * \brief Registers a function to create a process. * + * This function registers a function to be called + * when a new process is created. The function has + * to call SIMIX_process_create(). + * \param function create process function */ XBT_INLINE void SIMIX_function_register_process_create(smx_creation_func_t function) { - xbt_assert0((simix_global->create_process_function == NULL), - "Data already set"); - simix_global->create_process_function = function; } /** - * \brief Registers a function to kill a process. + * \brief Registers a function to kill a process. * - * This function registers an user function to be called when a new process is killed. The user function have to call the SIMIX_kill_process function. - * \param function Kill process function + * This function registers a function to be called when a + * process is killed. The function has to call the SIMIX_process_kill(). * + * \param function Kill process function */ -XBT_INLINE void SIMIX_function_register_process_kill(void_f_pvoid_t +XBT_INLINE void SIMIX_function_register_process_kill(void_pfn_smxprocess_t function) { - xbt_assert0((simix_global->kill_process_function == NULL), - "Data already set"); - simix_global->kill_process_function = function; } /** - * \brief Registers a function to cleanup a process. + * \brief Registers a function to cleanup a process. * - * This function registers an user function to be called when a new process ends properly. - * \param function cleanup process function + * This function registers a user function to be called when + * a process ends properly. * + * \param function cleanup process function */ XBT_INLINE void SIMIX_function_register_process_cleanup(void_pfn_smxprocess_t function) @@ -289,10 +325,10 @@ void SIMIX_display_process_status(void) smx_process_t process = NULL; int nbprocess = xbt_swag_size(simix_global->process_list); - INFO1("%d processes are still running, waiting for something.", nbprocess); + XBT_INFO("%d processes are still running, waiting for something.", nbprocess); /* List the process and their state */ - INFO0 - ("Legend of the following listing: \" on : .\""); + XBT_INFO + ("Legend of the following listing: \"() on : .\""); xbt_swag_foreach(process, simix_global->process_list) { if (process->waiting_action) { @@ -324,7 +360,33 @@ void SIMIX_display_process_status(void) action_description = "I/O"; break; } - INFO2("Waiting for %s action %p to finish", action_description, process->waiting_action); + XBT_INFO("Process %ld (%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, process->waiting_action->state); + } + else { + XBT_INFO("Process %ld (%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(); + return action; +} + +static void SIMIX_action_mallocator_free_f(void* action) { + xbt_fifo_free(((smx_action_t) action)->request_list); + 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; + xbt_fifo_reset(fifo); + memset(action, 0, sizeof(s_smx_action_t)); + ((smx_action_t) action)->request_list = fifo; +}