X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/fd769219531a772284d75320187a0ef9f8118afd..ec1ff601331bbc2a69a3d7501f468e2238be2a5e:/src/simix/smx_global.cpp diff --git a/src/simix/smx_global.cpp b/src/simix/smx_global.cpp index 2d559e7d9d..856ccc8c49 100644 --- a/src/simix/smx_global.cpp +++ b/src/simix/smx_global.cpp @@ -4,8 +4,9 @@ /* 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 /* Signal handling */ #include -#include "src/portable.h" +#include "src/internal_config.h" #include "src/surf/surf_interface.hpp" #include "src/surf/storage_interface.hpp" @@ -21,7 +22,7 @@ #if HAVE_MC #include "src/mc/mc_private.h" #include "src/mc/mc_protocol.h" -#include "src/mc/mc_client.h" +#include "src/mc/Client.hpp" #include #include "src/mc/mc_protocol.h" @@ -52,8 +53,6 @@ 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 int _sg_do_verbose_exit = 1; static void inthandler(int ignored) @@ -88,14 +87,14 @@ static void 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"); + "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"); + "Sadly, your system does not support --cfg=smpi/privatize-global-variables:yes (yet).\n"); #endif /* HAVE_PRIVATIZATION */ } #endif /* HAVE_SMPI */ @@ -144,8 +143,8 @@ static void install_segvhandler(void) } #endif /* _WIN32 */ -/********************************* SIMIX **************************************/ +/********************************* SIMIX **************************************/ double SIMIX_timer_next(void) { return xbt_heap_size(simix_timers) > 0 ? xbt_heap_maxkey(simix_timers) : -1.0; @@ -156,12 +155,6 @@ static void kill_process(smx_process_t process) SIMIX_process_kill(process, NULL); } -static void SIMIX_storage_create_(smx_storage_t storage) -{ - const char* key = xbt_dict_get_elm_key(storage); - SIMIX_storage_create(key, storage, NULL); -} - static std::function maestro_code; namespace simgrid { @@ -190,7 +183,9 @@ void SIMIX_set_maestro(void (*code)(void*), void* data) void SIMIX_global_init(int *argc, char **argv) { #if HAVE_MC - _sg_do_model_check = getenv(MC_ENV_VARIABLE) != NULL; + // The communication initialization is done ASAP. + // We need to communicate initialization of the different layers to the model-checker. + simgrid::mc::Client::initialize(); #endif s_smx_process_t proc; @@ -198,11 +193,6 @@ void SIMIX_global_init(int *argc, char **argv) if (!simix_global) { simix_global = xbt_new0(s_smx_global_t, 1); -#ifdef TIME_BENCH_AMDAHL - simix_global->timer_seq = xbt_os_timer_new(); - simix_global->timer_par = xbt_os_timer_new(); - xbt_os_cputimer_start(simix_global->timer_seq); -#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)); @@ -230,8 +220,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; - SIMIX_network_init(); - /* Prepare to display some more info when dying on Ctrl-C pressing */ signal(SIGINT, inthandler); @@ -247,12 +235,13 @@ void SIMIX_global_init(int *argc, char **argv) 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 - sg_storage_t s = xbt_lib_get_elm_or_null(storage_lib, id); - xbt_assert(s != NULL, "Storage not found for name %s", id); - SIMIX_storage_create_(s); - }); + const char* name = storage->getName(); + // TODO, create sg_storage_by_name + sg_storage_t s = xbt_lib_get_elm_or_null(storage_lib, name); + xbt_assert(s != NULL, "Storage not found for name %s", name); + + SIMIX_storage_create(name, s, NULL); + }); SIMIX_STORAGE_LEVEL = xbt_lib_add_level(storage_lib, SIMIX_storage_destroy); } @@ -260,15 +249,9 @@ void SIMIX_global_init(int *argc, char **argv) simix_timers = xbt_heap_new(8, &free); } - if (sg_cfg_get_boolean("clean_atexit")) + if (xbt_cfg_get_boolean("clean-atexit")) atexit(SIMIX_clean); -#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(); -#endif - if (_sg_cfg_exit_asap) exit(0); } @@ -282,9 +265,6 @@ int smx_cleaned = 0; */ void SIMIX_clean(void) { -#ifdef TIME_BENCH_PER_SR - smx_ctx_raw_new_sr(); -#endif if (smx_cleaned) return; // to avoid double cleaning by java and C smx_cleaned = 1; XBT_DEBUG("SIMIX_clean called. Simulation's over."); @@ -298,7 +278,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; @@ -329,15 +309,6 @@ void SIMIX_clean(void) surf_exit(); -#ifdef TIME_BENCH_AMDAHL - xbt_os_cputimer_stop(simix_global->timer_seq); - XBT_INFO("Amdahl timing informations. Sequential time: %f; Parallel time: %f", - xbt_os_timer_elapsed(simix_global->timer_seq), - xbt_os_timer_elapsed(simix_global->timer_par)); - xbt_os_timer_free(simix_global->timer_seq); - xbt_os_timer_free(simix_global->timer_par); -#endif - xbt_mallocator_free(simix_global->synchro_mallocator); xbt_free(simix_global); simix_global = NULL; @@ -380,9 +351,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; } @@ -396,23 +366,12 @@ void SIMIX_run(void) do { XBT_DEBUG("New Schedule Round; size(queue)=%lu", xbt_dynar_length(simix_global->process_to_run)); -#ifdef TIME_BENCH_PER_SR - smx_ctx_raw_new_sr(); -#endif 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)); /* Run all processes that are ready to run, possibly in parallel */ -#ifdef TIME_BENCH_AMDAHL - xbt_os_cputimer_stop(simix_global->timer_seq); - xbt_os_cputimer_resume(simix_global->timer_par); -#endif SIMIX_process_runall(); -#ifdef TIME_BENCH_AMDAHL - xbt_os_cputimer_stop(simix_global->timer_par); - xbt_os_cputimer_resume(simix_global->timer_seq); -#endif /* Move all killer processes to the end of the list, because killing a process that have an ongoing simcall is a bad idea */ xbt_dynar_three_way_partition(simix_global->process_that_ran, process_syscall_color);