X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/58205532bf7d35bd624c204dd814916b8e8b2fea..e22da6010c6499813ff88c76041cf499ffbf2b67:/src/simix/smx_global.cpp diff --git a/src/simix/smx_global.cpp b/src/simix/smx_global.cpp index d0e91ada96..50fb970def 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" @@ -17,9 +18,10 @@ #include "src/mc/mc_record.hpp" #include "src/mc/mc_replay.hpp" #include "src/simix/smx_private.hpp" -#include "src/surf/StorageImpl.hpp" #include "src/surf/xml/platf.hpp" +#include "simgrid/kernel/resource/Model.hpp" + #if SIMGRID_HAVE_MC #include "src/mc/remote/AppSide.hpp" #endif @@ -35,9 +37,7 @@ 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}; } // namespace simix } // namespace simgrid @@ -47,8 +47,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); @@ -72,7 +71,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) { @@ -87,8 +86,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. @@ -110,7 +107,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 */ @@ -136,14 +133,14 @@ namespace simix { Timer* Timer::set(double date, xbt::Task&& callback) { auto* timer = new Timer(date, std::move(callback)); - timer->handle_ = simix_timers.emplace(std::make_pair(date, timer)); + timer->handle_ = simix_timers().emplace(std::make_pair(date, timer)); return timer; } /** @brief cancels a timer that was added earlier */ void Timer::remove() { - simix_timers.erase(handle_); + simix_timers().erase(handle_); delete this; } @@ -199,7 +196,7 @@ 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) { + for (auto const& model : simgrid::kernel::EngineImpl::get_instance()->get_all_models()) { kernel::resource::Action* action; XBT_DEBUG("Handling the failed actions (if any)"); @@ -256,8 +253,7 @@ void Global::display_all_actor_status() const } 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 @@ -265,7 +261,8 @@ 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); } @@ -274,7 +271,7 @@ void SIMIX_set_maestro(void (*code)(void*), void* 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 SIMGRID_HAVE_MC // The communication initialization is done ASAP. @@ -308,7 +305,6 @@ void SIMIX_global_init(int *argc, char **argv) atexit(SIMIX_clean); } -int smx_cleaned = 0; /** * @ingroup SIMIX_API * @brief Clean the SIMIX simulation @@ -317,10 +313,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(" "); @@ -331,9 +328,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; } @@ -348,9 +345,9 @@ void SIMIX_clean() /* Exit the SIMIX network module */ SIMIX_mailbox_exit(); - while (not simgrid::simix::simix_timers.empty()) { - delete simgrid::simix::simix_timers.top().second; - simgrid::simix::simix_timers.pop(); + while (not simgrid::simix::simix_timers().empty()) { + delete simgrid::simix::simix_timers().top().second; + simgrid::simix::simix_timers().pop(); } /* Free the remaining data structures */ simix_global->actors_to_run.clear(); @@ -383,9 +380,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(); } } @@ -394,11 +391,12 @@ double SIMIX_get_clock() static bool SIMIX_execute_timers() { bool result = false; - while (not simgrid::simix::simix_timers.empty() && SIMIX_get_clock() >= simgrid::simix::simix_timers.top().first) { + while (not simgrid::simix::simix_timers().empty() && + SIMIX_get_clock() >= simgrid::simix::simix_timers().top().first) { result = true; // FIXME: make the timers being real callbacks (i.e. provide dispatchers that read and expand the args) - smx_timer_t timer = simgrid::simix::simix_timers.top().second; - simgrid::simix::simix_timers.pop(); + smx_timer_t timer = simgrid::simix::simix_timers().top().second; + simgrid::simix::simix_timers().pop(); timer->callback(); delete timer; }