X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7897fb8815dbff65907f646efb6f3ccf024e5481..03d36345c4247a907709b86c189a53f5f85bea88:/src/simix/smx_global.c diff --git a/src/simix/smx_global.c b/src/simix/smx_global.c index a169f8d9e6..6d52482a29 100644 --- a/src/simix/smx_global.c +++ b/src/simix/smx_global.c @@ -13,6 +13,15 @@ #include "mc/mc.h" #include "simgrid/sg_config.h" +#ifdef HAVE_MC +#include "mc/mc_private.h" +#endif +#include "mc/mc_record.h" + +#ifdef HAVE_SMPI +#include "smpi/private.h" +#endif + XBT_LOG_NEW_CATEGORY(simix, "All SIMIX categories"); XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_kernel, simix, "Logging specific to SIMIX (kernel)"); @@ -20,9 +29,9 @@ 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); +static void* SIMIX_synchro_mallocator_new_f(void); +static void SIMIX_synchro_mallocator_free_f(void* synchro); +static void SIMIX_synchro_mallocator_reset_f(void* synchro); /* FIXME: Yeah, I'll do it in a portable maner one day [Mt] */ #include @@ -31,11 +40,11 @@ int _sg_do_verbose_exit = 1; static void _XBT_CALL inthandler(int ignored) { if ( _sg_do_verbose_exit ) { - XBT_INFO("CTRL-C pressed. Displaying status and bailing out"); + XBT_INFO("CTRL-C pressed. The current status will be displayed before exit (disable that behavior with option 'verbose-exit')."); SIMIX_display_process_status(); } else { - XBT_INFO("CTRL-C pressed. bailing out without displaying because verbose-exit is disabled"); + XBT_INFO("CTRL-C pressed, exiting. Hiding the current process status since 'verbose-exit' is set to false."); } exit(1); } @@ -58,7 +67,23 @@ static void _XBT_CALL segvhandler(int signum, siginfo_t *siginfo, void *context) "siginfo = {si_signo = %d, si_errno = %d, si_code = %d, si_addr = %p}\n", siginfo->si_signo, siginfo->si_errno, siginfo->si_code, siginfo->si_addr); } + } else if (siginfo->si_signo == SIGSEGV) { + fprintf(stderr, "Segmentation fault.\n"); +#ifdef HAVE_SMPI + if (smpi_enabled() && !smpi_privatize_global_variables) { + fprintf(stderr, + "Try to enable SMPI variable privatization with --cfg=smpi/privatize_global_variables:yes.\n"); + } +#endif } +#ifdef HAVE_MC + if (MC_is_active()) { + if (mc_stack) { + MC_dump_stack_safety(mc_stack); + } + MC_print_statistics(mc_stats); + } +#endif raise(signum); } @@ -144,9 +169,9 @@ void SIMIX_global_init(int *argc, char **argv) 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); + simix_global->synchro_mallocator = xbt_mallocator_new(65536, + SIMIX_synchro_mallocator_new_f, SIMIX_synchro_mallocator_free_f, + SIMIX_synchro_mallocator_reset_f); simix_global->autorestart = SIMIX_host_restart_processes; surf_init(argc, argv); /* Initialize SURF structures */ @@ -191,9 +216,9 @@ void SIMIX_global_init(int *argc, char **argv) * * This functions remove the memory used by SIMIX */ -int cleaned = 0; void SIMIX_clean(void) { + static int cleaned = 0; #ifdef TIME_BENCH_PER_SR smx_ctx_raw_new_sr(); #endif @@ -240,7 +265,7 @@ void SIMIX_clean(void) xbt_os_timer_free(simix_global->timer_par); #endif - xbt_mallocator_free(simix_global->action_mallocator); + xbt_mallocator_free(simix_global->synchro_mallocator); xbt_free(simix_global); simix_global = NULL; @@ -282,6 +307,11 @@ static int process_syscall_color(void *p) */ void SIMIX_run(void) { + if(MC_record_path) { + MC_record_replay_from_string(MC_record_path); + return; + } + double time = 0; smx_process_t process; surf_action_t action; @@ -343,16 +373,16 @@ void SIMIX_run(void) * - because the communication failed or were canceled after startup. In this case, it's called from the function * we are in, by the chunk: * set = model->states.failed_action_set; - * while ((action = xbt_swag_extract(set))) - * SIMIX_simcall_post((smx_action_t) action->data); + * while ((synchro = xbt_swag_extract(set))) + * SIMIX_simcall_post((smx_synchro_t) synchro->data); * This order is also fixed because it depends of the order in which the surf actions were * added to the system, and only maestro can add stuff this way, through simcalls. - * We thus use the inductive hypothesis once again to conclude that the order in which actions are + * We thus use the inductive hypothesis once again to conclude that the order in which synchros are * poped out of the swag does not depend on the user code's execution order. - * - because the communication terminated. In this case, actions are served in the order given by + * - because the communication terminated. In this case, synchros are served in the order given by * set = model->states.done_action_set; - * while ((action = xbt_swag_extract(set))) - * SIMIX_simcall_post((smx_action_t) action->data); + * while ((synchro = xbt_swag_extract(set))) + * SIMIX_simcall_post((smx_synchro_t) synchro->data); * and the argument is very similar to the previous one. * So, in any case, the orders of calls to SIMIX_comm_finish() do not depend on the order in which user processes are executed. * So, in any cases, the orders of processes within process_to_run do not depend on the order in which user processes were executed previously. @@ -370,7 +400,7 @@ void SIMIX_run(void) xbt_dynar_foreach(simix_global->process_that_ran, iter, process) { if (process->simcall.call != SIMCALL_NONE) { - SIMIX_simcall_pre(&process->simcall, 0); + SIMIX_simcall_handle(&process->simcall, 0); } } } @@ -396,13 +426,13 @@ void SIMIX_run(void) /* Wake up all processes waiting for a Surf action to finish */ xbt_dynar_foreach(model_list, iter, model) { while ((action = surf_model_extract_failed_action_set(model))) - SIMIX_simcall_post((smx_action_t) surf_action_get_data(action)); + SIMIX_simcall_exit((smx_synchro_t) surf_action_get_data(action)); while ((action = surf_model_extract_done_action_set(model))) if (surf_action_get_data(action) == NULL) XBT_DEBUG("probably vcpu's action %p, skip", action); else - SIMIX_simcall_post((smx_action_t) surf_action_get_data(action)); + SIMIX_simcall_exit((smx_synchro_t) surf_action_get_data(action)); } /* Autorestart all process */ @@ -420,8 +450,6 @@ void SIMIX_run(void) XBT_DEBUG("### time %f, empty %d", time, xbt_dynar_is_empty(simix_global->process_to_run)); - // !(time == -1.0 && xbt_dynar_is_empty()) - } while (time != -1.0 || !xbt_dynar_is_empty(simix_global->process_to_run)); @@ -514,46 +542,43 @@ void SIMIX_display_process_status(void) ("Legend of the following listing: \"Process (@): \""); xbt_swag_foreach(process, simix_global->process_list) { - if (process->waiting_action) { + if (process->waiting_synchro) { - const char* action_description = "unknown"; - switch (process->waiting_action->type) { + const char* synchro_description = "unknown"; + switch (process->waiting_synchro->type) { - case SIMIX_ACTION_EXECUTE: - action_description = "execution"; + case SIMIX_SYNC_EXECUTE: + synchro_description = "execution"; break; - case SIMIX_ACTION_PARALLEL_EXECUTE: - action_description = "parallel execution"; + case SIMIX_SYNC_PARALLEL_EXECUTE: + synchro_description = "parallel execution"; break; - case SIMIX_ACTION_COMMUNICATE: - action_description = "communication"; + case SIMIX_SYNC_COMMUNICATE: + synchro_description = "communication"; break; - case SIMIX_ACTION_SLEEP: - action_description = "sleeping"; + case SIMIX_SYNC_SLEEP: + synchro_description = "sleeping"; break; - case SIMIX_ACTION_SYNCHRO: - action_description = "synchronization"; + case SIMIX_SYNC_JOIN: + synchro_description = "joining"; break; - case SIMIX_ACTION_IO: - action_description = "I/O"; + case SIMIX_SYNC_SYNCHRO: + synchro_description = "synchronization"; break; - /* **************************************/ - /* TUTORIAL: New API */ - case SIMIX_ACTION_NEW_API: - action_description = "NEW API"; - /* **************************************/ + case SIMIX_SYNC_IO: + synchro_description = "I/O"; break; } - XBT_INFO("Process %lu (%s@%s): waiting for %s action %p (%s) in state %d to finish", + XBT_INFO("Process %lu (%s@%s): waiting for %s synchro %p (%s) in state %d to finish", process->pid, process->name, sg_host_name(process->smx_host), - action_description, process->waiting_action, - process->waiting_action->name, (int)process->waiting_action->state); + synchro_description, process->waiting_synchro, + process->waiting_synchro->name, (int)process->waiting_synchro->state); } else { XBT_INFO("Process %lu (%s@%s)", process->pid, process->name, sg_host_name(process->smx_host)); @@ -561,31 +586,30 @@ void SIMIX_display_process_status(void) } } -static void* SIMIX_action_mallocator_new_f(void) { - smx_action_t action = xbt_new(s_smx_action_t, 1); - action->simcalls = xbt_fifo_new(); - return action; +static void* SIMIX_synchro_mallocator_new_f(void) { + smx_synchro_t synchro = xbt_new(s_smx_synchro_t, 1); + synchro->simcalls = xbt_fifo_new(); + return synchro; } -static void SIMIX_action_mallocator_free_f(void* action) { - xbt_fifo_free(((smx_action_t) action)->simcalls); - xbt_free(action); +static void SIMIX_synchro_mallocator_free_f(void* synchro) { + xbt_fifo_free(((smx_synchro_t) synchro)->simcalls); + xbt_free(synchro); } -static void SIMIX_action_mallocator_reset_f(void* action) { +static void SIMIX_synchro_mallocator_reset_f(void* synchro) { // we also recycle the simcall list - xbt_fifo_t fifo = ((smx_action_t) action)->simcalls; + xbt_fifo_t fifo = ((smx_synchro_t) synchro)->simcalls; xbt_fifo_reset(fifo); - memset(action, 0, sizeof(s_smx_action_t)); - ((smx_action_t) action)->simcalls = fifo; + memset(synchro, 0, sizeof(s_smx_synchro_t)); + ((smx_synchro_t) synchro)->simcalls = fifo; } -xbt_dict_t SIMIX_pre_asr_get_properties(smx_simcall_t simcall, const char *name){ +xbt_dict_t simcall_HANDLER_asr_get_properties(smx_simcall_t simcall, const char *name){ return SIMIX_asr_get_properties(name); } xbt_dict_t SIMIX_asr_get_properties(const char *name) { return xbt_lib_get_or_null(as_router_lib, name, ROUTING_PROP_ASR_LEVEL); } -