Changeset 149:70d2c2edc0f1 in finroc_plugins_structure

Timestamp:

01.11.2021 20:17:18 (2 years ago)

Author:

Max Reichardt <mreichardt@…>

Branch:

default

Parents:

146:a4bae722af30 (diff), 148:bc0f6205fb43 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Phase:

public

Tags:

tip

Message:

Merge with 17.03

File:

• main_utilities.cpp (modified) (4 diffs)

main_utilities.cpp

@@ -36 +36 @@
 //----------------------------------------------------------------------
 #include <cstdlib>
-#include <csignal>
 #include <mutex>
 #include <condition_variable>
@@ -67 +66 @@
 
 #include "rrlib/getopt/parser.h"
+#include "rrlib/util/tSignalHandler.h"
 
 //----------------------------------------------------------------------
@@ -341 +341 @@
 }
 
+class tSignalHandler : public rrlib::util::tSignalHandler
+{
+  virtual void OnSignal(int signal, bool& exit) override
+  {
+    if (signal == SIGINT)
+    {
+      HandleSignalSIGINT(signal);
+    }
+    else if (signal == SIGTERM)
+    {
+      HandleSignalSIGTERM(signal);
+    }
+    exit = false;
+  }
+} signal_handler;
+
 }
 
@@ -348 +364 @@
 bool InstallSignalHandler()
 {
-#if __linux__
-  struct sigaction signal_action;
-  signal_action.sa_handler = HandleSignalSIGINT;
-  sigemptyset(&signal_action.sa_mask);
-  signal_action.sa_flags = 0;
-
-  if (sigaction(SIGINT, &signal_action, NULL) != 0)
-  {
-    perror("Could not install signal handler");
-    return false;
-  }
-
-  signal_action.sa_handler = HandleSignalSIGTERM;
-  if (sigaction(SIGTERM, &signal_action, NULL) != 0)
-  {
-    perror("Could not install signal handler");
-    return false;
-  }
-
-#else
-  signal(SIGINT, HandleSignalSIGINT);
-  signal(SIGTERM, HandleSignalSIGTERM);
-#endif
-
+  if (!signal_handler.CatchedSignalMask())
+  {
+    return signal_handler.CatchSignal(SIGINT) && signal_handler.CatchSignal(SIGTERM);
+  }
   return true;
 }