X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7e0cd5a34743c53e4b01476dff65dbdca0161b77..d99d3238efb76357fcc6437c15fb900c3c02ebd4:/src/simix/smx_global.cpp diff --git a/src/simix/smx_global.cpp b/src/simix/smx_global.cpp index 218a8c869c..6e71f22486 100644 --- a/src/simix/smx_global.cpp +++ b/src/simix/smx_global.cpp @@ -5,11 +5,7 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include -#include "src/portable.h" -#ifdef HAVE_SYS_PTRACE_H -# include -# include -#endif +#include "src/internal_config.h" #include "src/surf/surf_interface.hpp" #include "src/surf/storage_interface.hpp" @@ -22,26 +18,23 @@ #include "src/mc/mc_replay.h" #include "simgrid/sg_config.h" -#ifdef HAVE_MC +#if HAVE_MC #include "src/mc/mc_private.h" #include "src/mc/mc_protocol.h" -#include "src/mc/mc_client.h" -#endif +#include "src/mc/Client.hpp" -#ifdef HAVE_MC #include #include "src/mc/mc_protocol.h" #endif #include "src/mc/mc_record.h" -#ifdef HAVE_SMPI +#if HAVE_SMPI #include "src/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)"); +XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_kernel, simix, "Logging specific to SIMIX (kernel)"); smx_global_t simix_global = NULL; static xbt_heap_t simix_timers = NULL; @@ -63,7 +56,7 @@ static void SIMIX_synchro_mallocator_reset_f(void* synchro); #include int _sg_do_verbose_exit = 1; -static void _XBT_CALL inthandler(int ignored) +static void inthandler(int ignored) { if ( _sg_do_verbose_exit ) { XBT_INFO("CTRL-C pressed. The current status will be displayed before exit (disable that behavior with option 'verbose-exit')."); @@ -75,8 +68,8 @@ static void _XBT_CALL inthandler(int ignored) exit(1); } -#ifndef WIN32 -static void _XBT_CALL segvhandler(int signum, siginfo_t *siginfo, void *context) +#ifndef _WIN32 +static void segvhandler(int signum, siginfo_t *siginfo, void *context) { if (siginfo->si_signo == SIGSEGV && siginfo->si_code == SEGV_ACCERR) { fprintf(stderr, @@ -95,17 +88,17 @@ static void _XBT_CALL segvhandler(int signum, siginfo_t *siginfo, void *context) } } else if (siginfo->si_signo == SIGSEGV) { fprintf(stderr, "Segmentation fault.\n"); -#ifdef HAVE_SMPI +#if HAVE_SMPI if (smpi_enabled() && !smpi_privatize_global_variables) { -#ifdef HAVE_PRIVATIZATION +#if HAVE_PRIVATIZATION fprintf(stderr, "Try to enable SMPI variable privatization with --cfg=smpi/privatize_global_variables:yes.\n"); #else fprintf(stderr, "Sadly, your system does not support --cfg=smpi/privatize_global_variables:yes (yet).\n"); -#endif +#endif /* HAVE_PRIVATIZATION */ } -#endif +#endif /* HAVE_SMPI */ } raise(signum); } @@ -124,8 +117,7 @@ static void install_segvhandler(void) stack.ss_flags = 0; if (sigaltstack(&stack, &old_stack) == -1) { - XBT_WARN("Failed to register alternate signal stack: %s", - strerror(errno)); + XBT_WARN("Failed to register alternate signal stack: %s", strerror(errno)); return; } if (!(old_stack.ss_flags & SS_DISABLE)) { @@ -140,8 +132,7 @@ static void install_segvhandler(void) sigemptyset(&action.sa_mask); if (sigaction(SIGSEGV, &action, &old_action) == -1) { - XBT_WARN("Failed to register signal handler for SIGSEGV: %s", - strerror(errno)); + XBT_WARN("Failed to register signal handler for SIGSEGV: %s", strerror(errno)); return; } if ((old_action.sa_flags & SA_SIGINFO) || old_action.sa_handler != SIG_DFL) { @@ -152,7 +143,7 @@ static void install_segvhandler(void) } } -#endif +#endif /* _WIN32 */ /********************************* SIMIX **************************************/ double SIMIX_timer_next(void) @@ -198,7 +189,7 @@ void SIMIX_set_maestro(void (*code)(void*), void* data) */ void SIMIX_global_init(int *argc, char **argv) { -#ifdef HAVE_MC +#if HAVE_MC _sg_do_model_check = getenv(MC_ENV_VARIABLE) != NULL; #endif @@ -214,10 +205,8 @@ void SIMIX_global_init(int *argc, char **argv) #endif 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->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_homogeneous(NULL); @@ -241,12 +230,10 @@ void SIMIX_global_init(int *argc, char **argv) __xbt_running_ctx_fetch = SIMIX_process_get_running_context; __xbt_ex_terminate = SIMIX_process_exception_terminate; - SIMIX_network_init(); - /* Prepare to display some more info when dying on Ctrl-C pressing */ signal(SIGINT, inthandler); -#ifndef WIN32 +#ifndef _WIN32 install_segvhandler(); #endif /* register a function to be called by SURF after the environment creation */ @@ -255,6 +242,8 @@ void SIMIX_global_init(int *argc, char **argv) simgrid::s4u::Host::onCreation.connect([](simgrid::s4u::Host& host) { SIMIX_host_create(&host); }); + SIMIX_HOST_LEVEL = simgrid::s4u::Host::extension_create(SIMIX_host_destroy); + simgrid::surf::storageCreatedCallbacks.connect([](simgrid::surf::Storage* storage) { const char* id = storage->getName(); // TODO, create sg_storage_by_name @@ -263,21 +252,19 @@ void SIMIX_global_init(int *argc, char **argv) SIMIX_storage_create_(s); }); - + SIMIX_STORAGE_LEVEL = xbt_lib_add_level(storage_lib, SIMIX_storage_destroy); } if (!simix_timers) { simix_timers = xbt_heap_new(8, &free); } - SIMIX_STORAGE_LEVEL = xbt_lib_add_level(storage_lib, SIMIX_storage_destroy); - - if (sg_cfg_get_boolean("clean_atexit")) + if (xbt_cfg_get_boolean("clean_atexit")) atexit(SIMIX_clean); -#ifdef HAVE_MC +#if HAVE_MC // The communication initialization is done ASAP. // We need to communicate initialization of the different layers to the model-checker. - MC_client_init(); + simgrid::mc::Client::initialize(); #endif if (_sg_cfg_exit_asap) @@ -309,7 +296,7 @@ void SIMIX_clean(void) SIMIX_process_killall(simix_global->maestro_process, 1); /* Exit the SIMIX network module */ - SIMIX_network_exit(); + SIMIX_mailbox_exit(); xbt_heap_free(simix_timers); simix_timers = NULL; @@ -391,9 +378,8 @@ static int process_syscall_color(void *p) */ void SIMIX_run(void) { - if(MC_record_path) { - MC_record_replay_init(); - MC_record_replay_from_string(MC_record_path); + if (MC_record_path) { + simgrid::mc::replay(MC_record_path); return; }