"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",
- simgrid::kernel::context::stack_size / 1024);
+ simgrid::kernel::context::Context::stack_size / 1024);
} else if (siginfo->si_signo == SIGSEGV) {
fprintf(stderr, "Segmentation fault.\n");
#if HAVE_SMPI
std::raise(signum);
}
-/**
- * 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()
+static void install_signal_handlers()
{
- stack_t old_stack;
+ /* Install signal handler for SIGINT */
+ std::signal(SIGINT, inthandler);
- if (simgrid::kernel::context::Context::install_sigsegv_stack(&old_stack, true) == -1) {
+ /* Install signal handler for SIGSEGV */
+ if (simgrid::kernel::context::Context::install_sigsegv_stack(true) == -1) {
XBT_WARN("Failed to register alternate signal stack: %s", strerror(errno));
return;
}
- if (not(old_stack.ss_flags & SS_DISABLE)) {
- XBT_DEBUG("An alternate stack was already installed (sp=%p, size=%zu, flags=%x). Restore it.", old_stack.ss_sp,
- old_stack.ss_size, (unsigned)old_stack.ss_flags);
- sigaltstack(&old_stack, nullptr);
- }
struct sigaction action;
- struct sigaction old_action;
action.sa_sigaction = &segvhandler;
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 */
for (int sig : {SIGSEGV, SIGBUS}) {
- if (sigaction(sig, &action, &old_action) == -1) {
+ if (sigaction(sig, &action, nullptr) == -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);
- }
}
}
instance_->context_mod_init();
- /* Prepare to display some more info when dying on Ctrl-C pressing */
- std::signal(SIGINT, inthandler);
- install_segvhandler();
+ install_signal_handlers();
/* register a function to be called by SURF after the environment creation */
- sg_platf_init();
s4u::Engine::on_platform_created_cb([this]() { this->presolve(); });
if (config::get_value<bool>("debug/clean-atexit"))
}
#endif
- /* select the context factory to use to create the contexts */
- if (context::ContextFactory::initializer) { // Give Java a chance to hijack the factory mechanism
- instance_->set_context_factory(context::ContextFactory::initializer());
- return;
- }
/* use the factory specified by --cfg=contexts/factory:value */
for (auto const& [factory_name, factory] : context_factories)
if (context_factory_name == factory_name) {
XBT_ERROR(" (boost was disabled at compilation time on this machine -- check configure logs for details. Did you "
"install the libboost-context-dev package?)");
#endif
- XBT_ERROR(" thread: slow portability layer using pthreads as provided by gcc");
+ XBT_ERROR(" thread: slow portability layer using standard threads as provided by libstdc");
xbt_die("Please use a valid factory.");
}
}
}
tmgr_finalize();
- sg_platf_exit();
+ sg_platf_parser_finalize();
delete instance_;
instance_ = nullptr;
void EngineImpl::load_deployment(const std::string& file) const
{
- sg_platf_exit();
- sg_platf_init();
+ sg_platf_parser_finalize();
- surf_parse_open(file);
- surf_parse();
- surf_parse_close();
+ simgrid_parse_open(file);
+ simgrid_parse();
+ simgrid_parse_close();
}
void EngineImpl::register_function(const std::string& name, const actor::ActorCodeFactory& code)