From 2d700043abc5686faa54d215ffe60c92f4d0c00e Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Tue, 12 Feb 2013 15:48:39 -0600 Subject: core: use g_unix_signal_add() for more reliable Unix signal handling There were a few problems with MM's existing signal handling, first of which was that calling g_main_loop_quit() from a signal handler only works 50% of the time due to severe restrictions on what you can do from the handler. This caused INT or TERM to sometimes be ignored by MM. Instead, use the glib signal functions which ensure that the handler is run in the right context, where we can do anything we want. --- src/main.c | 38 +++++++++++--------------------------- 1 file changed, 11 insertions(+), 27 deletions(-) (limited to 'src/main.c') diff --git a/src/main.c b/src/main.c index 5a8081e9..29b87a49 100644 --- a/src/main.c +++ b/src/main.c @@ -22,6 +22,7 @@ #include #include +#include #include "ModemManager.h" @@ -39,33 +40,15 @@ static GMainLoop *loop; static MMManager *manager; -static void -mm_signal_handler (int signo) +static gboolean +quit_cb (gpointer user_data) { - if (signo == SIGUSR1) - mm_log_usr1 (); - else if (signo == SIGINT || signo == SIGTERM) { - mm_info ("Caught signal %d, shutting down...", signo); - if (loop) - g_main_loop_quit (loop); - else - _exit (0); - } -} - -static void -setup_signals (void) -{ - struct sigaction action; - sigset_t mask; - - sigemptyset (&mask); - action.sa_handler = mm_signal_handler; - action.sa_mask = mask; - action.sa_flags = 0; - sigaction (SIGUSR1, &action, NULL); - sigaction (SIGTERM, &action, NULL); - sigaction (SIGINT, &action, NULL); + mm_info ("Caught signal, shutting down..."); + if (loop) + g_idle_add ((GSourceFunc) g_main_loop_quit, loop); + else + _exit (0); + return FALSE; } static void @@ -139,7 +122,8 @@ main (int argc, char *argv[]) exit (1); } - setup_signals (); + g_unix_signal_add (SIGTERM, quit_cb, NULL); + g_unix_signal_add (SIGINT, quit_cb, NULL); mm_info ("ModemManager (version " MM_DIST_VERSION ") starting..."); -- cgit v1.2.3-70-g09d2