#1002 Add option do disable signal hanlders in vt::finalize

DARMA-tasking · Sep 7, 2020 · 8ed61a6 · 8ed61a6
1 parent f9b7e74
commit 8ed61a6
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 7 deletions.
diff --git a/src/vt/runtime/runtime.cc b/src/vt/runtime/runtime.cc
@@ -333,7 +333,7 @@ bool Runtime::tryInitialize() {
   return init_now;
 }
 
-bool Runtime::tryFinalize() {
+bool Runtime::tryFinalize(bool const disable_sig) {
   bool const rt_live = !finalized_ && initialized_;
   bool const has_run_sched = hasSchedRun();
   bool const finalize_now = rt_live && has_run_sched;
@@ -347,7 +347,7 @@ bool Runtime::tryFinalize() {
   );
 
   if (finalize_now) {
-    finalize(true);
+    finalize(true, disable_sig);
   } else {
     finalize_on_term_ = true;
   }
@@ -399,7 +399,7 @@ bool Runtime::initialize(bool const force_now) {
   }
 }
 
-bool Runtime::finalize(bool const force_now) {
+bool Runtime::finalize(bool const force_now, bool const disable_sig) {
   if (force_now) {
     using component::BaseComponent;
 
@@ -431,10 +431,17 @@ bool Runtime::finalize(bool const force_now) {
     }
 
     finalizeMPI();
+
+    if (disable_sig) {
+      signal(SIGSEGV, SIG_DFL);
+      signal(SIGUSR1, SIG_DFL);
+      signal(SIGINT, SIG_DFL);
+    }
+
     finalized_ = true;
     return true;
   } else {
-    return tryFinalize();
+    return tryFinalize(disable_sig);
   }
 }
 

diff --git a/src/vt/runtime/runtime.h b/src/vt/runtime/runtime.h
@@ -171,10 +171,11 @@ struct Runtime {
    * \internal \brief Finalize the runtime
    *
    * \param[in] force_now whether to force finalization regardless of state
+   * \param[in] disable_sig whether to disable signal handlers
    *
    * \return whether it finalized or not
    */
-  bool finalize(bool const force_now = false);
+  bool finalize(bool const force_now = false, bool const disable_sig = true);
 
   /**
    * \brief Run the scheduler once
@@ -252,10 +253,11 @@ struct Runtime {
 
   /**
    * \internal \brief Try to finalize
+   * \param[in] disable_sig whether to disable signal handlers
    *
    * \return whether it succeeded
    */
-  bool tryFinalize();
+  bool tryFinalize(bool const disable_sig);
 
   /**
    * \internal \brief Setup argument input

diff --git a/tests/unit/pipe/test_signal_cleanup.cc b/tests/unit/pipe/test_signal_cleanup.cc
@@ -90,7 +90,7 @@ TEST_F(TestSignalCleanup, test_signal_cleanup_3) {
   do vt::runScheduler(); while (not vt::rt->isTerminated());
 
   // explicitly finalize runtime to destroy and reset components
-  vt::rt->finalize(true);
+  vt::rt->finalize(true, false);
 
   // re-init runtime, fresh state---force it now!
   vt::rt->initialize(true);