From c59fa1fcce83a7a3c956f7d2996afb5074f9d1d7 Mon Sep 17 00:00:00 2001
From: Martin Quinson <martin.quinson@ens-rennes.fr>
Date: Mon, 16 Jan 2023 00:40:35 +0100
Subject: [PATCH] another useless cleanup

---
 src/kernel/EngineImpl.cpp | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/kernel/EngineImpl.cpp b/src/kernel/EngineImpl.cpp
index 3e4703915b..efbd8812a2 100644
--- a/src/kernel/EngineImpl.cpp
+++ b/src/kernel/EngineImpl.cpp
@@ -115,11 +115,12 @@ static void segvhandler(int signum, siginfo_t* siginfo, void* /*context*/)
   std::raise(signum);
 }
 
-/**
- * Install signal handler for SIGSEGV.
- */
-static void install_segvhandler()
+static void install_signal_handlers()
 {
+  /* Install signal handler for SIGINT */
+  std::signal(SIGINT, inthandler);
+
+  /* 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;
@@ -181,9 +182,7 @@ 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();
-- 
2.20.1