summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosé Bollo <jose.bollo@iot.bzh>2017-12-21 12:33:32 +0100
committerJosé Bollo <jose.bollo@iot.bzh>2018-01-03 09:41:41 +0100
commitb659dabd9d8a72b810d212a1b938409185a81432 (patch)
tree73d7db1be0482e1f1818a828a84b5d9d151cc00f
parent87f97db754ac68c3a351a73370d0557b27914adc (diff)
sig-monitor: Make signal list global
Change-Id: I456a08dccf65d1a188e7bb7e0a6ab905ae823a25 Signed-off-by: José Bollo <jose.bollo@iot.bzh>
-rw-r--r--src/sig-monitor.c44
1 files changed, 22 insertions, 22 deletions
diff --git a/src/sig-monitor.c b/src/sig-monitor.c
index db833437..f5762bcc 100644
--- a/src/sig-monitor.c
+++ b/src/sig-monitor.c
@@ -40,6 +40,9 @@ static _Thread_local int in_safe_dumpstack;
static _Thread_local int thread_timer_set;
static _Thread_local timer_t thread_timerid;
+/* internal signal lists */
+static int sigerr[] = { SIG_FOR_TIMER, SIGSEGV, SIGFPE, SIGILL, SIGBUS, 0 };
+static int sigterm[] = { SIGINT, SIGABRT, SIGTERM, 0 };
/*
* Dumps the current stack
*/
@@ -161,6 +164,25 @@ static inline void timeout_delete()
}
}
+/* install the handlers */
+static int install(void (*handler)(int), int *signals)
+{
+ int result = 1;
+ struct sigaction sa;
+
+ sa.sa_handler = handler;
+ sigemptyset(&sa.sa_mask);
+ sa.sa_flags = SA_NODEFER;
+ while(*signals > 0) {
+ if (sigaction(*signals, &sa, NULL) < 0) {
+ ERROR("failed to install signal handler for signal %s: %m", strsignal(*signals));
+ result = 0;
+ }
+ signals++;
+ }
+ return result;
+}
+
/* Handles signals that terminate the process */
static void on_signal_terminate (int signum)
@@ -193,30 +215,8 @@ static void on_signal_error(int signum)
exit(2);
}
-/* install the handlers */
-static int install(void (*handler)(int), int *signals)
-{
- int result = 1;
- struct sigaction sa;
-
- sa.sa_handler = handler;
- sigemptyset(&sa.sa_mask);
- sa.sa_flags = SA_NODEFER;
- while(*signals > 0) {
- if (sigaction(*signals, &sa, NULL) < 0) {
- ERROR("failed to install signal handler for signal %s: %m", strsignal(*signals));
- result = 0;
- }
- signals++;
- }
- return result;
-}
-
int sig_monitor_init()
{
- static int sigerr[] = { SIG_FOR_TIMER, SIGSEGV, SIGFPE, SIGILL, SIGBUS, 0 };
- static int sigterm[] = { SIGINT, SIGABRT, SIGTERM, 0 };
-
return (install(on_signal_error, sigerr) & install(on_signal_terminate, sigterm)) - 1;
}