Further rename the identifiers of flexml to simgrid_parse_*

[simgrid.git] / src / kernel / EngineImpl.cpp

diff --git a/src/kernel/EngineImpl.cpp b/src/kernel/EngineImpl.cpp
index 2d8208f..3e170be 100644 (file)
--- a/src/kernel/EngineImpl.cpp
+++ b/src/kernel/EngineImpl.cpp
@@ -99,7 +99,7 @@ static void segvhandler(int signum, siginfo_t* siginfo, void* /*context*/)
             "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
@@ -115,41 +115,26 @@ static void segvhandler(int signum, siginfo_t* siginfo, void* /*context*/)
   std::raise(signum);
 }
 
-/**
- * Install signal handler for SIGSEGV.  Check that nobody has already installed its own handler.
- * Historically, the Java VM did that but this could maybe removed now that Java is gone (TODO)
- */
-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);
-    }
   }
 }
 
@@ -197,12 +182,9 @@ void EngineImpl::initialize(int* argc, char** argv)
 
   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"))
@@ -289,7 +271,7 @@ void EngineImpl::shutdown()
   }
 
   tmgr_finalize();
-  sg_platf_exit();
+  sg_platf_parser_finalize();
 
   delete instance_;
   instance_ = nullptr;
@@ -329,12 +311,11 @@ void EngineImpl::load_platform(const std::string& platf)
 
 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)