X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/45e426637aefc9860afe15b75812d48898975fe3..8b1c61e4ab2768975287e5ec62ca850c79d69bdc:/src/simix/smx_global.cpp diff --git a/src/simix/smx_global.cpp b/src/simix/smx_global.cpp index fe14085bb6..ca6d7bf0a5 100644 --- a/src/simix/smx_global.cpp +++ b/src/simix/smx_global.cpp @@ -9,6 +9,7 @@ #include "src/smpi/include/smpi_actor.hpp" #include "simgrid/sg_config.hpp" +#include "src/kernel/EngineImpl.hpp" #include "src/kernel/activity/ExecImpl.hpp" #include "src/kernel/activity/IoImpl.hpp" #include "src/kernel/activity/MailboxImpl.hpp" @@ -36,9 +37,25 @@ void (*SMPI_switch_data_segment)(simgrid::s4u::ActorPtr) = nullptr; namespace simgrid { namespace simix { -config::Flag cfg_verbose_exit{"debug/verbose-exit", - "Display the actor status at exit", - true}; +config::Flag cfg_verbose_exit{"debug/verbose-exit", "Display the actor status at exit", true}; + +void* simix_global_get_actors_addr() +{ +#if SIMGRID_HAVE_MC + return simix_global->actors_vector; +#else + xbt_die("This function is intended to be used when compiling with MC"); +#endif +} +void* simix_global_get_dead_actors_addr() +{ +#if SIMGRID_HAVE_MC + return simix_global->dead_actors_vector; +#else + xbt_die("This function is intended to be used when compiling with MC"); +#endif +} + } // namespace simix } // namespace simgrid @@ -48,8 +65,7 @@ XBT_ATTRIB_NORETURN static void inthandler(int) XBT_INFO("CTRL-C pressed. The current status will be displayed before exit (disable that behavior with option " "'debug/verbose-exit')."); simix_global->display_all_actor_status(); - } - else { + } else { XBT_INFO("CTRL-C pressed, exiting. Hiding the current process status since 'debug/verbose-exit' is set to false."); } exit(1); @@ -73,7 +89,7 @@ static void segvhandler(int signum, siginfo_t* siginfo, void* /*context*/) "Minimal Working Example (MWE) reproducing your problem and a full backtrace\n" "of the fault captured with gdb or valgrind.\n", smx_context_stack_size / 1024); - } else if (siginfo->si_signo == SIGSEGV) { + } else if (siginfo->si_signo == SIGSEGV) { fprintf(stderr, "Segmentation fault.\n"); #if HAVE_SMPI if (smpi_enabled() && smpi_cfg_privatization() == SmpiPrivStrategies::NONE) { @@ -88,8 +104,6 @@ static void segvhandler(int signum, siginfo_t* siginfo, void* /*context*/) std::raise(signum); } -std::array sigsegv_stack; /* alternate stack for SIGSEGV handler */ - /** * Install signal handler for SIGSEGV. Check that nobody has already installed * its own handler. For example, the Java VM does this. @@ -111,7 +125,7 @@ static void install_segvhandler() struct sigaction action; struct sigaction old_action; action.sa_sigaction = &segvhandler; - action.sa_flags = SA_ONSTACK | SA_RESETHAND | SA_SIGINFO; + action.sa_flags = SA_ONSTACK | SA_RESETHAND | SA_SIGINFO; sigemptyset(&action.sa_mask); /* Linux tend to raise only SIGSEGV where other systems also raise SIGBUS on severe error */ @@ -200,17 +214,15 @@ void Global::run_all_actors() /** Wake up all actors waiting for a Surf action to finish */ void Global::wake_all_waiting_actors() const { - for (auto const& model : all_existing_models) { - kernel::resource::Action* action; - + for (auto const& model : simgrid::kernel::EngineImpl::get_instance()->get_all_models()) { XBT_DEBUG("Handling the failed actions (if any)"); - while ((action = model->extract_failed_action())) { + while (auto* action = model->extract_failed_action()) { XBT_DEBUG(" Handling Action %p", action); if (action->get_activity() != nullptr) kernel::activity::ActivityImplPtr(action->get_activity())->post(); } XBT_DEBUG("Handling the terminated actions (if any)"); - while ((action = model->extract_done_action())) { + while (auto* action = model->extract_done_action()) { XBT_DEBUG(" Handling Action %p", action); if (action->get_activity() == nullptr) XBT_DEBUG("probably vcpu's action %p, skip", action); @@ -251,14 +263,14 @@ void Global::display_all_actor_status() const (xbt_log_no_loc ? (size_t)0xDEADBEEF : (size_t)actor->waiting_synchro_.get()), actor->waiting_synchro_->get_cname(), (int)actor->waiting_synchro_->state_); } else { - XBT_INFO("Actor %ld (%s@%s)", actor->get_pid(), actor->get_cname(), actor->get_host()->get_cname()); + XBT_INFO("Actor %ld (%s@%s) simcall %s", actor->get_pid(), actor->get_cname(), actor->get_host()->get_cname(), SIMIX_simcall_name(actor->simcall_.call_)); + } } } config::Flag cfg_breakpoint{"debug/breakpoint", - "When non-negative, raise a SIGTRAP after given (simulated) time", - -1.0}; + "When non-negative, raise a SIGTRAP after given (simulated) time", -1.0}; } // namespace simix } // namespace simgrid @@ -266,27 +278,25 @@ static simgrid::kernel::actor::ActorCode maestro_code; void SIMIX_set_maestro(void (*code)(void*), void* data) { #ifdef _WIN32 - XBT_INFO("WARNING, SIMIX_set_maestro is believed to not work on windows. Please help us investigating this issue if you need that feature"); + XBT_INFO("WARNING, SIMIX_set_maestro is believed to not work on windows. Please help us investigating this issue if " + "you need that feature"); #endif maestro_code = std::bind(code, data); } -/** - * @ingroup SIMIX_API - * @brief Initialize SIMIX internal data. - */ -void SIMIX_global_init(int *argc, char **argv) +void SIMIX_global_init(int* argc, char** argv) { + if (simix_global == nullptr) { + simix_global = std::make_unique(); + #if SIMGRID_HAVE_MC - // The communication initialization is done ASAP. - // We need to communicate initialization of the different layers to the model-checker. - simgrid::mc::AppSide::initialize(); + // The communication initialization is done ASAP, as we need to get some init parameters from the MC for different layers. + // But simix_global needs to be created, as we send the address of some of its fields to the MC that wants to read them directly. + simgrid::mc::AppSide::initialize(); #endif - if (simix_global == nullptr) { surf_init(argc, argv); /* Initialize SURF structures */ - simix_global = std::make_unique(); simix_global->maestro_ = nullptr; SIMIX_context_mod_init(); @@ -309,7 +319,6 @@ void SIMIX_global_init(int *argc, char **argv) atexit(SIMIX_clean); } -int smx_cleaned = 0; /** * @ingroup SIMIX_API * @brief Clean the SIMIX simulation @@ -318,10 +327,11 @@ int smx_cleaned = 0; */ void SIMIX_clean() { + static bool smx_cleaned = false; if (smx_cleaned) return; // to avoid double cleaning by java and C - smx_cleaned = 1; + smx_cleaned = true; XBT_DEBUG("SIMIX_clean called. Simulation's over."); if (not simix_global->actors_to_run.empty() && SIMIX_get_clock() <= 0.0) { XBT_CRITICAL(" "); @@ -332,9 +342,9 @@ void SIMIX_clean() #if HAVE_SMPI if (not simix_global->process_list.empty()) { - if(smpi_process()->initialized()){ + if (smpi_process()->initialized()) { xbt_die("Process exited without calling MPI_Finalize - Killing simulation"); - }else{ + } else { XBT_WARN("Process called exit when leaving - Skipping cleanups"); return; } @@ -384,9 +394,9 @@ void SIMIX_clean() */ double SIMIX_get_clock() { - if(MC_is_active() || MC_record_replay_is_active()){ + if (MC_is_active() || MC_record_replay_is_active()) { return MC_process_clock_get(SIMIX_process_self()); - }else{ + } else { return surf_get_clock(); } } @@ -589,7 +599,7 @@ void SIMIX_timer_remove(smx_timer_t timer) // XBT_ATTRIB_DEPRECATED_v329 /** @brief Returns the date at which the timer will trigger (or 0 if nullptr timer) */ double SIMIX_timer_get_date(smx_timer_t timer) // XBT_ATTRIB_DEPRECATED_v329 { - return timer ? timer->get_date() : 0; + return timer ? timer->date : 0.0; } void SIMIX_display_process_status() // XBT_ATTRIB_DEPRECATED_v329