From e1e01ba0d2950206cdd13a6375ade8b158217cc2 Mon Sep 17 00:00:00 2001 From: Jannis Pohlmann Date: Wed, 25 Jul 2012 14:55:27 +0100 Subject: [PATCH] Use SIGHUP instead of SIGINT for simulating an NSM shutdown In the SIGHUP handler, we no longer shut down the NSM process so that we can keep it around for debugging purposes. --- nsm-dummy/nsm-dummy-application.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/nsm-dummy/nsm-dummy-application.c b/nsm-dummy/nsm-dummy-application.c index 031f148..c9c841c 100644 --- a/nsm-dummy/nsm-dummy-application.c +++ b/nsm-dummy/nsm-dummy-application.c @@ -38,17 +38,18 @@ enum }; -static void nsm_dummy_application_constructed (GObject *object); -static void nsm_dummy_application_finalize (GObject *object); -static void nsm_dummy_application_get_property (GObject *object, - guint prop_id, - GValue *value, - GParamSpec *pspec); -static void nsm_dummy_application_set_property (GObject *object, - guint prop_id, - const GValue *value, - GParamSpec *pspec); -static gboolean nsm_dummy_application_int_handler (NSMDummyApplication *application); + +static void nsm_dummy_application_constructed (GObject *object); +static void nsm_dummy_application_finalize (GObject *object); +static void nsm_dummy_application_get_property (GObject *object, + guint prop_id, + GValue *value, + GParamSpec *pspec); +static void nsm_dummy_application_set_property (GObject *object, + guint prop_id, + const GValue *value, + GParamSpec *pspec); +static gboolean nsm_dummy_application_handle_sighup (gpointer user_data); @@ -76,7 +77,7 @@ struct _NSMDummyApplication GMainLoop *main_loop; /* signal handler IDs */ - guint sigint_id; + guint sighup_id; /* Identifier for the registered bus name */ guint bus_name_id; @@ -148,9 +149,8 @@ nsm_dummy_application_init (NSMDummyApplication *application) application->watchdog_client = watchdog_client_new (120); /* install the signal handler */ - application->sigint_id = - g_unix_signal_add (SIGINT, (GSourceFunc) nsm_dummy_application_int_handler, - application); + application->sighup_id = g_unix_signal_add (SIGHUP, nsm_dummy_application_handle_sighup, + application); } @@ -168,7 +168,7 @@ nsm_dummy_application_finalize (GObject *object) g_bus_unown_name (application->bus_name_id); /* release the signal handler */ - g_source_remove (application->sigint_id); + g_source_remove (application->sighup_id); /* release the watchdog client */ g_object_unref (application->watchdog_client); -- 2.7.4