further improve handling signals on linux

Author: malytomas

sources/libcore/concurrent/process.cpp

@@ -5,11 +5,11 @@
 
 #ifdef CAGE_SYSTEM_WINDOWS
 	#include "../windowsMinimumInclude.h"
-	#include <signal.h>
+	#include <csignal>
 	#include <psapi.h>
 #else
 	#include <fcntl.h>
-	#include <signal.h>
+	#include <csignal>
 	#include <sys/ioctl.h>
 	#include <sys/stat.h>
 	#include <sys/types.h>
@@ -546,33 +546,4 @@ namespace cage
 			return {};
 		return r;
 	}
-
-	namespace
-	{
-		Delegate<void()> sigTermHandler;
-		void sigTermHandlerEntry(int)
-		{
-			if (sigTermHandler)
-				sigTermHandler();
-		}
-
-		Delegate<void()> sigIntHandler;
-		void sigIntHandlerEntry(int)
-		{
-			if (sigIntHandler)
-				sigIntHandler();
-		}
-	}
-
-	void installSigTermHandler(Delegate<void()> handler)
-	{
-		sigTermHandler = handler;
-		signal(SIGTERM, &sigTermHandlerEntry);
-	}
-
-	void installSigIntHandler(Delegate<void()> handler)
-	{
-		sigIntHandler = handler;
-		signal(SIGINT, &sigIntHandlerEntry);
-	}
 }

sources/libcore/errors/crashHandlerLinux.cpp

@@ -11,7 +11,7 @@
 	#include <ucontext.h>
 	#include <unistd.h>
 
-	#include <cage-core/core.h>
+	#include <cage-core/process.h> // installSigTermHandler
 
 namespace cage
 {
@@ -140,9 +140,25 @@ namespace cage
 			performPreviousHandler(sig, si, uctx);
 		}
 
+		Delegate<void()> sigTermHandler;
+		Delegate<void()> sigIntHandler;
+
 		void intHandler(int sig, siginfo_t *si, void *uctx)
 		{
 			safeWrite(Stringizer() + "signal handler: " + sigToStr(sig) + " (" + sig + ")\n");
+
+			switch (sig)
+			{
+				case SIGTERM:
+					if (sigTermHandler)
+						sigTermHandler();
+					break;
+				case SIGINT:
+					if (sigIntHandler)
+						sigIntHandler();
+					break;
+			}
+
 			performPreviousHandler(sig, si, uctx);
 		}
 
@@ -172,6 +188,16 @@ namespace cage
 			}
 		} setupHandlers;
 	}
+
+	void installSigTermHandler(Delegate<void()> handler)
+	{
+		sigTermHandler = handler;
+	}
+
+	void installSigIntHandler(Delegate<void()> handler)
+	{
+		sigIntHandler = handler;
+	}
 }
 
 #endif // CAGE_SYSTEM_LINUX

sources/libcore/errors/crashHandlerMacos.cpp

@@ -1,6 +1,8 @@
 #ifdef CAGE_SYSTEM_MAC
 
-	#include <cage-core/core.h>
+	#include <csignal>
+
+	#include <cage-core/process.h> // installSigTermHandler
 
 namespace cage
 {
@@ -16,6 +18,35 @@ namespace cage
 			SetupHandlers() { crashHandlerThreadInit(); }
 		} setupHandlers;
 	}
+
+	namespace
+	{
+		Delegate<void()> sigTermHandler;
+		void sigTermHandlerEntry(int)
+		{
+			if (sigTermHandler)
+				sigTermHandler();
+		}
+
+		Delegate<void()> sigIntHandler;
+		void sigIntHandlerEntry(int)
+		{
+			if (sigIntHandler)
+				sigIntHandler();
+		}
+	}
+
+	void installSigTermHandler(Delegate<void()> handler)
+	{
+		sigTermHandler = handler;
+		signal(SIGTERM, &sigTermHandlerEntry);
+	}
+
+	void installSigIntHandler(Delegate<void()> handler)
+	{
+		sigIntHandler = handler;
+		signal(SIGINT, &sigIntHandlerEntry);
+	}
 }
 
 #endif // CAGE_SYSTEM_MAC

sources/libcore/errors/crashHandlerWindows.cpp

@@ -1,15 +1,16 @@
 #ifdef CAGE_SYSTEM_WINDOWS
 
 	#include "../windowsMinimumInclude.h"
+	#include <csignal>
 	#include <DbgHelp.h>
 
 	#pragma comment(lib, "DbgHelp.lib")
 	#define EXCEPTION_CPP 0xE06D7363
 	#define EXCEPTION_DOTNET 0xE0434352
 	#define EXCEPTION_RENAME_THREAD 0x406D1388
 
-	#include <cage-core/core.h>
 	#include <cage-core/concurrent.h>
+	#include <cage-core/process.h> // installSigTermHandler
 
 namespace cage
 {
@@ -295,6 +296,35 @@ namespace cage
 			}
 		} setupHandlers;
 	}
+
+	namespace
+	{
+		Delegate<void()> sigTermHandler;
+		void sigTermHandlerEntry(int)
+		{
+			if (sigTermHandler)
+				sigTermHandler();
+		}
+
+		Delegate<void()> sigIntHandler;
+		void sigIntHandlerEntry(int)
+		{
+			if (sigIntHandler)
+				sigIntHandler();
+		}
+	}
+
+	void installSigTermHandler(Delegate<void()> handler)
+	{
+		sigTermHandler = handler;
+		signal(SIGTERM, &sigTermHandlerEntry);
+	}
+
+	void installSigIntHandler(Delegate<void()> handler)
+	{
+		sigIntHandler = handler;
+		signal(SIGINT, &sigIntHandlerEntry);
+	}
 }
 
 #endif // CAGE_SYSTEM_WINDOWS