X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b9625f82f86db0674e911887addce45dca31b57f..898b4287bda43070014e56b9716567c91165e081:/src/simix/smx_global.cpp diff --git a/src/simix/smx_global.cpp b/src/simix/smx_global.cpp index 8ae0f08757..3d2ec1d47a 100644 --- a/src/simix/smx_global.cpp +++ b/src/simix/smx_global.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2007-2020. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2007-2021. The SimGrid Team. All rights reserved. */ /* 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. */ @@ -17,13 +17,15 @@ #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 +#include XBT_LOG_NEW_CATEGORY(simix, "All SIMIX categories"); XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_kernel, simix, "Logging specific to SIMIX (kernel)"); @@ -34,7 +36,9 @@ void (*SMPI_switch_data_segment)(simgrid::s4u::ActorPtr) = nullptr; namespace simgrid { namespace simix { -config::Flag cfg_verbose_exit{"debug/verbose-exit", {"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 @@ -84,21 +88,15 @@ static void segvhandler(int signum, siginfo_t* siginfo, void* /*context*/) std::raise(signum); } -unsigned char sigsegv_stack[SIGSTKSZ]; /* 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. */ static void install_segvhandler() { - stack_t stack; stack_t old_stack; - stack.ss_sp = sigsegv_stack; - stack.ss_size = sizeof sigsegv_stack; - stack.ss_flags = 0; - if (sigaltstack(&stack, &old_stack) == -1) { + if (simgrid::kernel::context::Context::install_sigsegv_stack(&old_stack, true) == -1) { XBT_WARN("Failed to register alternate signal stack: %s", strerror(errno)); return; } @@ -136,15 +134,15 @@ namespace simix { Timer* Timer::set(double date, xbt::Task&& callback) { - Timer* timer = new Timer(date, std::move(callback)); - timer->handle_ = simix_timers.emplace(std::make_pair(date, timer)); + auto* timer = new Timer(date, std::move(callback)); + 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; } @@ -256,8 +254,9 @@ void Global::display_all_actor_status() const } } -config::Flag cfg_breakpoint{ - "debug/breakpoint", {"simix/breakpoint"}, "When non-negative, raise a SIGTRAP after given (simulated) time", -1.0}; +config::Flag cfg_breakpoint{"debug/breakpoint", + "When non-negative, raise a SIGTRAP after given (simulated) time", + -1.0}; } // namespace simix } // namespace simgrid @@ -285,7 +284,7 @@ void SIMIX_global_init(int *argc, char **argv) if (simix_global == nullptr) { surf_init(argc, argv); /* Initialize SURF structures */ - simix_global.reset(new simgrid::simix::Global()); + simix_global = std::make_unique(); simix_global->maestro_ = nullptr; SIMIX_context_mod_init(); @@ -308,7 +307,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 +315,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(" "); @@ -330,7 +329,7 @@ void SIMIX_clean() } #if HAVE_SMPI - if (simix_global->process_list.size() > 0) { + if (not simix_global->process_list.empty()) { if(smpi_process()->initialized()){ xbt_die("Process exited without calling MPI_Finalize - Killing simulation"); }else{ @@ -348,9 +347,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(); @@ -394,11 +393,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; } @@ -412,7 +412,7 @@ static bool SIMIX_execute_timers() void SIMIX_run() { if (MC_record_replay_is_active()) { - simgrid::mc::replay(MC_record_path); + simgrid::mc::replay(MC_record_path()); return; } @@ -502,7 +502,7 @@ void SIMIX_run() */ for (auto const& actor : simix_global->actors_that_ran) { - if (actor->simcall_.call_ != SIMCALL_NONE) { + if (actor->simcall_.call_ != simgrid::simix::Simcall::NONE) { actor->simcall_handle(0); } }