X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f626888caadf3f7020eb820d9146772c1c349144..41527b07b1aef8fe1c379f5b346e2110f3d228f8:/src/simix/smx_global.cpp diff --git a/src/simix/smx_global.cpp b/src/simix/smx_global.cpp index 6187806948..1349b13e20 100644 --- a/src/simix/smx_global.cpp +++ b/src/simix/smx_global.cpp @@ -24,6 +24,7 @@ #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 +35,7 @@ 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", {"verbose-exit"}, "Display the actor status at exit", true}; } // namespace simix } // namespace simgrid @@ -84,7 +85,7 @@ static void segvhandler(int signum, siginfo_t* siginfo, void* /*context*/) std::raise(signum); } -unsigned char sigsegv_stack[SIGSTKSZ]; /* alternate stack for SIGSEGV handler */ +std::array sigsegv_stack; /* alternate stack for SIGSEGV handler */ /** * Install signal handler for SIGSEGV. Check that nobody has already installed @@ -94,8 +95,8 @@ static void install_segvhandler() { stack_t stack; stack_t old_stack; - stack.ss_sp = sigsegv_stack; - stack.ss_size = sizeof sigsegv_stack; + stack.ss_sp = sigsegv_stack.data(); + stack.ss_size = sigsegv_stack.size(); stack.ss_flags = 0; if (sigaltstack(&stack, &old_stack) == -1) { @@ -136,7 +137,7 @@ namespace simix { Timer* Timer::set(double date, xbt::Task&& callback) { - Timer* timer = new Timer(date, std::move(callback)); + auto* timer = new Timer(date, std::move(callback)); timer->handle_ = simix_timers.emplace(std::make_pair(date, timer)); return timer; } @@ -198,7 +199,7 @@ void Global::run_all_actors() } /** Wake up all actors waiting for a Surf action to finish */ -void Global::wake_all_waiting_actors() +void Global::wake_all_waiting_actors() const { for (auto const& model : all_existing_models) { kernel::resource::Action* action; @@ -220,7 +221,7 @@ void Global::wake_all_waiting_actors() } } -void Global::display_all_actor_status() +void Global::display_all_actor_status() const { XBT_INFO("%zu actors are still running, waiting for something.", process_list.size()); /* List the actors and their state */ @@ -285,7 +286,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(); @@ -330,7 +331,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{