handle more exceptionnal signals

[src/app-framework-binder.git] / src / sig-monitor.c

diff --git a/src/sig-monitor.c b/src/sig-monitor.c
index 3e16f72..bd1311a 100644 (file)
--- a/src/sig-monitor.c
+++ b/src/sig-monitor.c
@@ -24,10 +24,13 @@
 #include <time.h>
 #include <unistd.h>
 #include <sys/syscall.h>
+#include <execinfo.h>
 
 #include "sig-monitor.h"
 #include "verbose.h"
 
+#define SIG_FOR_TIMER   SIGVTALRM
+
 /* local handler */
 static _Thread_local sigjmp_buf *error_handler;
 
@@ -35,6 +38,26 @@ static _Thread_local sigjmp_buf *error_handler;
 static _Thread_local int thread_timer_set;
 static _Thread_local timer_t thread_timerid;
 
+/*
+ * Dumps the current stack
+ */
+static void dumpstack(int crop)
+{
+       int idx, count;
+       void *addresses[1000];
+       char **locations;
+
+       count = backtrace(addresses, sizeof addresses / sizeof *addresses);
+       locations = backtrace_symbols(addresses, count);
+       if (locations == NULL)
+               ERROR("can't get the backtrace (returned %d addresses)", count);
+       else {
+               for (idx = crop; idx < count; idx++)
+                       ERROR("[BACKTRACE %d/%d] %s", idx - crop + 1, count - crop, locations[idx]);
+               free(locations);
+       }
+}
+
 /*
  * Creates a timer for the current thread
  *
@@ -49,7 +72,7 @@ static inline int timeout_create()
                rc = 0;
        else {
                sevp.sigev_notify = SIGEV_THREAD_ID;
-               sevp.sigev_signo = SIGALRM;
+               sevp.sigev_signo = SIG_FOR_TIMER;
                sevp.sigev_value.sival_ptr = NULL;
 #if defined(sigev_notify_thread_id)
                sevp.sigev_notify_thread_id = (pid_t)syscall(SYS_gettid);
@@ -116,6 +139,10 @@ static void on_signal_error(int signum)
        sigset_t sigset;
 
        ERROR("ALERT! signal %d received: %s", signum, strsignal(signum));
+       if (error_handler == NULL && signum == SIG_FOR_TIMER)
+               return;
+
+       dumpstack(3);
 
        // unlock signal to allow a new signal to come
        if (error_handler != NULL) {
@@ -124,8 +151,6 @@ static void on_signal_error(int signum)
                sigprocmask(SIG_UNBLOCK, &sigset, 0);
                longjmp(*error_handler, signum);
        }
-       if (signum == SIGALRM)
-               return;
        ERROR("Unmonitored signal %d received: %s", signum, strsignal(signum));
        exit(2);
 }
@@ -146,8 +171,8 @@ static int install(void (*handler)(int), int *signals)
 
 int sig_monitor_init()
 {
-       static int sigerr[] = { SIGALRM, SIGSEGV, SIGFPE, 0 };
-       static int sigterm[] = { SIGINT, SIGABRT, 0 };
+       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;
 }
@@ -185,6 +210,3 @@ void sig_monitor(int timeout, void (*function)(int sig, void*), void *arg)
 }
 
 
-
-
-