X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1ab127b8091f2629cbb8191c075ea671b2d76a11..334e868fd56cf359ef71557b7eba026687fbef73:/src/simix/smx_global.cpp diff --git a/src/simix/smx_global.cpp b/src/simix/smx_global.cpp index 1bea3ddd2a..d693ac8812 100644 --- a/src/simix/smx_global.cpp +++ b/src/simix/smx_global.cpp @@ -4,12 +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" -#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 +19,29 @@ #include "src/mc/mc_replay.h" #include "simgrid/sg_config.h" -#ifdef HAVE_MC +#include "src/simix/SynchroExec.hpp" +#include "src/simix/SynchroComm.hpp" +#include "src/simix/SynchroSleep.hpp" +#include "src/simix/SynchroIo.hpp" +#include "src/simix/SynchroRaw.hpp" + +#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; @@ -55,15 +55,8 @@ typedef struct s_smx_timer { void (*SMPI_switch_data_segment)(int) = NULL; -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 _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')."); @@ -95,14 +88,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 */ @@ -151,8 +144,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; @@ -163,12 +156,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 { @@ -196,8 +183,10 @@ void SIMIX_set_maestro(void (*code)(void*), void* data) */ void SIMIX_global_init(int *argc, char **argv) { -#ifdef HAVE_MC - _sg_do_model_check = getenv(MC_ENV_VARIABLE) != NULL; +#if HAVE_MC + // 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; @@ -205,11 +194,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)); @@ -221,9 +205,6 @@ void SIMIX_global_init(int *argc, char **argv) simix_global->create_process_function = SIMIX_process_create; simix_global->kill_process_function = kill_process; simix_global->cleanup_process_function = SIMIX_process_cleanup; - 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->mutex = xbt_os_mutex_init(); surf_init(argc, argv); /* Initialize SURF structures */ @@ -237,8 +218,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); @@ -254,12 +233,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); } @@ -267,15 +247,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); -#ifdef 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); } @@ -289,9 +263,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."); @@ -305,7 +276,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; @@ -336,16 +307,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; @@ -387,9 +348,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; } @@ -403,23 +363,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); @@ -655,36 +604,34 @@ void SIMIX_display_process_status(void) if (process->waiting_synchro) { const char* synchro_description = "unknown"; - switch (process->waiting_synchro->type) { - case SIMIX_SYNC_EXECUTE: + if (dynamic_cast(process->waiting_synchro) != nullptr) synchro_description = "execution"; - break; - case SIMIX_SYNC_PARALLEL_EXECUTE: - synchro_description = "parallel execution"; - break; - - case SIMIX_SYNC_COMMUNICATE: + if (dynamic_cast(process->waiting_synchro) != nullptr) synchro_description = "communication"; - break; - case SIMIX_SYNC_SLEEP: + if (dynamic_cast(process->waiting_synchro) != nullptr) synchro_description = "sleeping"; + + if (dynamic_cast(process->waiting_synchro) != nullptr) + synchro_description = "synchronization"; + + if (dynamic_cast(process->waiting_synchro) != nullptr) + synchro_description = "I/O"; + + + /* + switch (process->waiting_synchro->type) { + case SIMIX_SYNC_PARALLEL_EXECUTE: + synchro_description = "parallel execution"; break; case SIMIX_SYNC_JOIN: synchro_description = "joining"; break; +*/ - case SIMIX_SYNC_SYNCHRO: - synchro_description = "synchronization"; - break; - - case SIMIX_SYNC_IO: - synchro_description = "I/O"; - break; - } XBT_INFO("Process %lu (%s@%s): waiting for %s synchro %p (%s) in state %d to finish", process->pid, process->name, sg_host_get_name(process->host), synchro_description, process->waiting_synchro, @@ -696,26 +643,6 @@ void SIMIX_display_process_status(void) } } -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_synchro_mallocator_free_f(void* synchro) { - xbt_fifo_free(((smx_synchro_t) synchro)->simcalls); - xbt_free(synchro); -} - -static void SIMIX_synchro_mallocator_reset_f(void* synchro) { - - // we also recycle the simcall list - xbt_fifo_t fifo = ((smx_synchro_t) synchro)->simcalls; - xbt_fifo_reset(fifo); - memset(synchro, 0, sizeof(s_smx_synchro_t)); - ((smx_synchro_t) synchro)->simcalls = fifo; -} - xbt_dict_t simcall_HANDLER_asr_get_properties(smx_simcall_t simcall, const char *name){ return SIMIX_asr_get_properties(name); }