X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/53f36dc53dfef67528460488c6d8ee3913153968..04e4b74194a2a469fa52ea1b29f0a7265a24434f:/src/simix/smx_global.cpp diff --git a/src/simix/smx_global.cpp b/src/simix/smx_global.cpp index 4028e9a21a..1af8b5b51e 100644 --- a/src/simix/smx_global.cpp +++ b/src/simix/smx_global.cpp @@ -34,10 +34,10 @@ void (*SMPI_switch_data_segment)(simgrid::s4u::ActorPtr) = nullptr; namespace simgrid { namespace simix { -simgrid::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 + XBT_ATTRIB_NORETURN static void inthandler(int) { if (simgrid::simix::cfg_verbose_exit) { @@ -54,19 +54,20 @@ XBT_ATTRIB_NORETURN static void inthandler(int) #ifndef _WIN32 static void segvhandler(int signum, siginfo_t* siginfo, void* /*context*/) { - if (siginfo->si_signo == SIGSEGV && siginfo->si_code == SEGV_ACCERR) { - fprintf(stderr, "Access violation detected.\n" - "This probably comes from a programming error in your code, or from a stack\n" - "overflow. If you are certain of your code, try increasing the stack size\n" - " --cfg=contexts/stack-size=XXX (current size is %u KiB).\n" - "\n" - "If it does not help, this may have one of the following causes:\n" - "a bug in SimGrid, a bug in the OS or a bug in a third-party libraries.\n" - "Failing hardware can sometimes generate such errors too.\n" - "\n" - "If you think you've found a bug in SimGrid, please report it along with a\n" - "Minimal Working Example (MWE) reproducing your problem and a full backtrace\n" - "of the fault captured with gdb or valgrind.\n", + if ((siginfo->si_signo == SIGSEGV && siginfo->si_code == SEGV_ACCERR) || siginfo->si_signo == SIGBUS) { + fprintf(stderr, + "Access violation or Bus error detected.\n" + "This probably comes from a programming error in your code, or from a stack\n" + "overflow. If you are certain of your code, try increasing the stack size\n" + " --cfg=contexts/stack-size=XXX (current size is %u KiB).\n" + "\n" + "If it does not help, this may have one of the following causes:\n" + "a bug in SimGrid, a bug in the OS or a bug in a third-party libraries.\n" + "Failing hardware can sometimes generate such errors too.\n" + "\n" + "If you think you've found a bug in SimGrid, please report it along with a\n" + "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) { fprintf(stderr, "Segmentation fault.\n"); @@ -113,14 +114,17 @@ static void install_segvhandler() action.sa_flags = SA_ONSTACK | SA_RESETHAND | SA_SIGINFO; sigemptyset(&action.sa_mask); - if (sigaction(SIGSEGV, &action, &old_action) == -1) { - XBT_WARN("Failed to register signal handler for SIGSEGV: %s", strerror(errno)); - return; - } - if ((old_action.sa_flags & SA_SIGINFO) || old_action.sa_handler != SIG_DFL) { - XBT_DEBUG("A signal handler was already installed for SIGSEGV (%p). Restore it.", - (old_action.sa_flags & SA_SIGINFO) ? (void*)old_action.sa_sigaction : (void*)old_action.sa_handler); - sigaction(SIGSEGV, &old_action, nullptr); + /* Linux tend to raise only SIGSEGV where other systems also raise SIGBUS on severe error */ + for (int sig : {SIGSEGV, SIGBUS}) { + if (sigaction(sig, &action, &old_action) == -1) { + XBT_WARN("Failed to register signal handler for signal %d: %s", sig, strerror(errno)); + continue; + } + if ((old_action.sa_flags & SA_SIGINFO) || old_action.sa_handler != SIG_DFL) { + XBT_DEBUG("A signal handler was already installed for signal %d (%p). Restore it.", sig, + (old_action.sa_flags & SA_SIGINFO) ? (void*)old_action.sa_sigaction : (void*)old_action.sa_handler); + sigaction(sig, &old_action, nullptr); + } } } @@ -130,7 +134,7 @@ static void install_segvhandler() namespace simgrid { namespace simix { -Timer* Timer::set(double date, simgrid::xbt::Task&& callback) +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)); @@ -140,7 +144,7 @@ Timer* Timer::set(double date, simgrid::xbt::Task&& callback) /** @brief cancels a timer that was added earlier */ void Timer::remove() { - simgrid::simix::simix_timers.erase(handle_); + simix_timers.erase(handle_); delete this; } @@ -169,7 +173,7 @@ bool Global::execute_tasks() void Global::empty_trash() { while (not actors_to_destroy.empty()) { - smx_actor_t actor = &actors_to_destroy.front(); + kernel::actor::ActorImpl* actor = &actors_to_destroy.front(); actors_to_destroy.pop_front(); XBT_DEBUG("Getting rid of %s (refcount: %d)", actor->get_cname(), actor->get_refcount()); intrusive_ptr_release(actor); @@ -193,10 +197,10 @@ void Global::run_all_actors() actors_to_run.clear(); } -simgrid::config::Flag cfg_breakpoint{ +config::Flag cfg_breakpoint{ "debug/breakpoint", {"simix/breakpoint"}, "When non-negative, raise a SIGTRAP after given (simulated) time", -1.0}; -} -} +} // namespace simix +} // namespace simgrid static simgrid::simix::ActorCode maestro_code; void SIMIX_set_maestro(void (*code)(void*), void* data) @@ -227,7 +231,7 @@ void SIMIX_global_init(int *argc, char **argv) SIMIX_context_mod_init(); // Either create a new context with maestro or create - // a context object with the current context mestro): + // a context object with the current context maestro): simgrid::kernel::actor::create_maestro(maestro_code); /* Prepare to display some more info when dying on Ctrl-C pressing */ @@ -284,7 +288,7 @@ void SIMIX_clean() /* Kill all processes (but maestro) */ simix_global->maestro_process->kill_all(); - simix_global->context_factory->run_all(); + simix_global->run_all_actors(); simix_global->empty_trash(); /* Exit the SIMIX network module */ @@ -466,9 +470,9 @@ void SIMIX_run() * That would thus be a pure waste of time. */ - for (smx_actor_t const& process : simix_global->actors_that_ran) { - if (process->simcall.call_ != SIMCALL_NONE) { - process->simcall_handle(0); + for (auto const& actor : simix_global->actors_that_ran) { + if (actor->simcall.call_ != SIMCALL_NONE) { + actor->simcall_handle(0); } } @@ -528,28 +532,25 @@ void SIMIX_run() simgrid::s4u::Engine::on_simulation_end(); } -double SIMIX_timer_next() +double SIMIX_timer_next() // XBT_ATTRIB_DEPRECATED_v329 { return simgrid::simix::Timer::next(); } -smx_timer_t SIMIX_timer_set(double date, void (*callback)(void*), void *arg) +smx_timer_t SIMIX_timer_set(double date, void (*callback)(void*), void* arg) // XBT_ATTRIB_DEPRECATED_v329 { return simgrid::simix::Timer::set(date, std::bind(callback, arg)); } -smx_timer_t SIMIX_timer_set(double date, simgrid::xbt::Task&& callback) // deprecated -{ - return simgrid::simix::Timer::set(date, std::move(callback)); -} - /** @brief cancels a timer that was added earlier */ -void SIMIX_timer_remove(smx_timer_t timer) { +void SIMIX_timer_remove(smx_timer_t timer) // XBT_ATTRIB_DEPRECATED_v329 +{ timer->remove(); } /** @brief Returns the date at which the timer will trigger (or 0 if nullptr timer) */ -double SIMIX_timer_get_date(smx_timer_t timer) { +double SIMIX_timer_get_date(smx_timer_t timer) // XBT_ATTRIB_DEPRECATED_v329 +{ return timer ? timer->get_date() : 0; } @@ -561,7 +562,7 @@ void SIMIX_display_process_status() /* List the process and their state */ XBT_INFO("Legend of the following listing: \"Process (@): \""); for (auto const& kv : simix_global->process_list) { - smx_actor_t actor = kv.second; + simgrid::kernel::actor::ActorImpl* actor = kv.second; if (actor->waiting_synchro) { @@ -599,6 +600,8 @@ void SIMIX_display_process_status() int SIMIX_is_maestro() { - smx_actor_t self = SIMIX_process_self(); - return simix_global == nullptr /*SimDag*/ || self == nullptr || self == simix_global->maestro_process; + if (simix_global == nullptr) // SimDag + return true; + simgrid::kernel::actor::ActorImpl* self = SIMIX_process_self(); + return self == nullptr || self == simix_global->maestro_process; }