Address peer review comment

ivanpauno · ivanpauno · commit d23d20652f9c · 2021-09-28T15:36:17.000-03:00
Signed-off-by: Ivan Santiago Paunovic &lt;ivanpauno@ekumenlabs.com&gt;
diff --git a/rclcpp/include/rclcpp/utilities.hpp b/rclcpp/include/rclcpp/utilities.hpp
@@ -99,6 +99,14 @@ RCLCPP_PUBLIC
 bool
 signal_handlers_installed();
 
+/// Get the current signal handler options.
+/**
+ * If no signal handler is installed, SignalHandlerOptions::None is returned.
+ */
+RCLCPP_PUBLIC
+SignalHandlerOptions
+get_current_signal_handler_options();
+
 /// Uninstall the global signal handler for rclcpp.
 /**
  * This function does not necessarily need to be called, but can be used to
diff --git a/rclcpp/src/rclcpp/signal_handler.cpp b/rclcpp/src/rclcpp/signal_handler.cpp
@@ -188,7 +188,7 @@ SignalHandler::uninstall()
     {
       set_signal_handler(SIGTERM, old_sigterm_handler_);
     }
-    signal_handlers_options_ = SignalHandlerOptions::All;
+    signal_handlers_options_ = SignalHandlerOptions::None;
     RCLCPP_DEBUG(get_logger(), "SignalHandler::uninstall(): notifying deferred signal handler");
     notify_signal_handler();
     signal_handler_thread_.join();
@@ -380,3 +380,9 @@ SignalHandler::notify_signal_handler() noexcept
   }
 #endif
 }
+
+rclcpp::SignalHandlerOptions
+SignalHandler::get_current_signal_handler_options()
+{
+  return signal_handlers_options_;
+}
diff --git a/rclcpp/src/rclcpp/signal_handler.hpp b/rclcpp/src/rclcpp/signal_handler.hpp
@@ -87,6 +87,13 @@ class SignalHandler final
   bool
   is_installed();
 
+  /// Get the current signal handler options.
+  /**
+   * If no signal handler is installed, SignalHandlerOptions::None is returned.
+   */
+  rclcpp::SignalHandlerOptions
+  get_current_signal_handler_options();
+
 private:
   /// Signal handler type, platform dependent.
 #if defined(RCLCPP_HAS_SIGACTION)
@@ -172,7 +179,7 @@ class SignalHandler final
   signal_handler_type
   get_old_signal_handler(int signum);
 
-  rclcpp::SignalHandlerOptions signal_handlers_options_ = rclcpp::SignalHandlerOptions::All;
+  rclcpp::SignalHandlerOptions signal_handlers_options_ = rclcpp::SignalHandlerOptions::None;
 
   signal_handler_type old_sigint_handler_;
   signal_handler_type old_sigterm_handler_;
diff --git a/rclcpp/src/rclcpp/utilities.cpp b/rclcpp/src/rclcpp/utilities.cpp
@@ -55,6 +55,13 @@ signal_handlers_installed()
   return SignalHandler::get_global_signal_handler().is_installed();
 }
 
+SignalHandlerOptions
+get_current_signal_handler_options()
+{
+  return SignalHandler::get_global_signal_handler().get_current_signal_handler_options();
+}
+
+
 bool
 uninstall_signal_handlers()
 {

Original file line number	Diff line number	Diff line change
`@@ -188,7 +188,7 @@ SignalHandler::uninstall()`
`188`	`188`	`{`
`189`	`189`	`set_signal_handler(SIGTERM, old_sigterm_handler_);`
`190`	`190`	`}`
`191`		`- signal_handlers_options_ = SignalHandlerOptions::All;`
	`191`	`+ signal_handlers_options_ = SignalHandlerOptions::None;`
`192`	`192`	`RCLCPP_DEBUG(get_logger(), "SignalHandler::uninstall(): notifying deferred signal handler");`
`193`	`193`	`notify_signal_handler();`
`194`	`194`	`signal_handler_thread_.join();`
`@@ -380,3 +380,9 @@ SignalHandler::notify_signal_handler() noexcept`
`380`	`380`	`}`
`381`	`381`	`#endif`
`382`	`382`	`}`
	`383`	`+`
	`384`	`+rclcpp::SignalHandlerOptions`
	`385`	`+SignalHandler::get_current_signal_handler_options()`
	`386`	`+{`
	`387`	`+ return signal_handlers_options_;`
	`388`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -55,6 +55,13 @@ signal_handlers_installed()`
`55`	`55`	`return SignalHandler::get_global_signal_handler().is_installed();`
`56`	`56`	`}`
`57`	`57`
	`58`	`+SignalHandlerOptions`
	`59`	`+get_current_signal_handler_options()`
	`60`	`+{`
	`61`	`+ return SignalHandler::get_global_signal_handler().get_current_signal_handler_options();`
	`62`	`+}`
	`63`	`+`
	`64`	`+`
`58`	`65`	`bool`
`59`	`66`	`uninstall_signal_handlers()`
`60`	`67`	`{`