← Back to branch summary

~darkxst/ubuntu/trusty/gdm/nokill

« back to all changes in this revision

Viewing changes to daemon/simple-slave-main.c

  • Committer: Package Import Robot
  • Author(s): Jeremy Bicha, Tim Lunn, Jeremy Bicha, Robert Ancell
  • Date: 2013-05-31 22:36:08 UTC
  • mfrom: (1.4.55)
  • Revision ID: package-import@ubuntu.com-20130531223608-33uo85niksee5460
Tags: 3.8.1.1-0ubuntu1
[ Tim Lunn ]
* New upstream release
* debian/patches/ubuntu_dont_catch_sigsegv.patch:
  - Dropped, obsolete
* debian/rules:
  - Don't rename gdm binary since that's already been
    done in the new version

[ Jeremy Bicha ]
* debian/control.in: Bump minimum glib
* debian/watch: Watch for unstable releases
* debian/patches/00git_logind_check.patch:
  - Dropped, applied in new release
* debian/patches/08_frequent-users_greeter.patch: Refreshed

[ Robert Ancell ]
* New upstream release
* debian/patches/ubuntu_daemon_autologin_tracking.patch:
* debian/patches/ubuntu_ensure_dirs.patch:
* debian/patches/ubuntu_slave-only-set-up-autologin.patch:
  - Applied upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
daemon/simple-slave-main.c
37
37
#include <gio/gio.h>
38
38
 
39
39
#include "gdm-xerrors.h"
40
 
#include "gdm-signal-handler.h"
41
40
#include "gdm-log.h"
42
41
#include "gdm-common.h"
43
42
#include "gdm-simple-slave.h"
71
70
}
72
71
 
73
72
static gboolean
74
 
signal_cb (int      signo,
75
 
           gpointer data)
76
 
{
77
 
        int ret;
78
 
 
79
 
        g_debug ("Got callback for signal %d", signo);
80
 
 
81
 
        ret = TRUE;
82
 
 
83
 
        switch (signo) {
84
 
        case SIGSEGV:
85
 
        case SIGBUS:
86
 
        case SIGILL:
87
 
        case SIGABRT:
88
 
                g_debug ("Caught signal %d.", signo);
89
 
 
90
 
                ret = FALSE;
91
 
                break;
92
 
 
93
 
        case SIGFPE:
94
 
        case SIGPIPE:
95
 
                /* let the fatal signals interrupt us */
96
 
                g_debug ("Caught signal %d, shutting down abnormally.", signo);
97
 
                ret = FALSE;
98
 
 
99
 
                break;
100
 
 
101
 
        case SIGINT:
102
 
        case SIGTERM:
103
 
                /* let the fatal signals interrupt us */
104
 
                g_debug ("Caught signal %d, shutting down normally.", signo);
105
 
                ret = FALSE;
106
 
 
107
 
                break;
108
 
 
109
 
        case SIGHUP:
110
 
                g_debug ("Got HUP signal");
111
 
                /* FIXME:
112
 
                 * Reread config stuff like system config files, VPN service files, etc
113
 
                 */
114
 
                ret = TRUE;
115
 
 
116
 
                break;
117
 
 
118
 
        case SIGUSR1:
119
 
                g_debug ("Got USR1 signal");
120
 
                /* we get this from xorg - can't use for anything else */
121
 
                ret = TRUE;
122
 
 
123
 
                break;
124
 
 
125
 
        case SIGUSR2:
126
 
                g_debug ("Got USR2 signal");
127
 
                ret = TRUE;
128
 
 
129
 
                gdm_log_toggle_debug ();
130
 
 
131
 
                break;
132
 
 
133
 
        default:
134
 
                g_debug ("Caught unhandled signal %d", signo);
135
 
                ret = TRUE;
136
 
 
137
 
                break;
138
 
        }
139
 
 
140
 
        return ret;
 
73
on_shutdown_signal_cb (gpointer user_data)
 
74
{
 
75
        GMainLoop *mainloop = user_data;
 
76
 
 
77
        g_main_loop_quit (mainloop);
 
78
 
 
79
        return FALSE;
 
80
}
 
81
 
 
82
static gboolean
 
83
on_sigusr2_cb (gpointer user_data)
 
84
{
 
85
        g_debug ("Got USR2 signal");
 
86
 
 
87
        gdm_log_toggle_debug ();
 
88
 
 
89
        return TRUE;
141
90
}
142
91
 
143
92
static void
172
121
        GDBusConnection  *connection;
173
122
        GdmSlave         *slave;
174
123
        static char      *display_id = NULL;
175
 
        GdmSignalHandler *signal_handler;
176
124
        static GOptionEntry entries []   = {
177
125
                { "display-id", 0, 0, G_OPTION_ARG_STRING, &display_id, N_("Display ID"), N_("ID") },
178
126
                { NULL }
182
130
        textdomain (GETTEXT_PACKAGE);
183
131
        setlocale (LC_ALL, "");
184
132
 
185
 
        g_type_init ();
186
 
 
187
133
        context = g_option_context_new (_("GNOME Display Manager Slave"));
188
134
        g_option_context_add_main_entries (context, entries, NULL);
189
135
 
226
172
 
227
173
        main_loop = g_main_loop_new (NULL, FALSE);
228
174
 
229
 
        signal_handler = gdm_signal_handler_new ();
230
 
        gdm_signal_handler_set_fatal_func (signal_handler,
231
 
                                           (GDestroyNotify)g_main_loop_quit,
232
 
                                           main_loop);
233
 
        gdm_signal_handler_add (signal_handler, SIGTERM, signal_cb, NULL);
234
 
        gdm_signal_handler_add (signal_handler, SIGINT, signal_cb, NULL);
235
 
        gdm_signal_handler_add (signal_handler, SIGILL, signal_cb, NULL);
236
 
        gdm_signal_handler_add (signal_handler, SIGBUS, signal_cb, NULL);
237
 
        gdm_signal_handler_add (signal_handler, SIGFPE, signal_cb, NULL);
238
 
        gdm_signal_handler_add (signal_handler, SIGHUP, signal_cb, NULL);
239
 
        /*gdm_signal_handler_add (signal_handler, SIGSEGV, signal_cb, NULL);*/
240
 
        gdm_signal_handler_add (signal_handler, SIGABRT, signal_cb, NULL);
241
 
        gdm_signal_handler_add (signal_handler, SIGUSR1, signal_cb, NULL);
242
 
        gdm_signal_handler_add (signal_handler, SIGUSR2, signal_cb, NULL);
 
175
        g_unix_signal_add (SIGTERM, on_shutdown_signal_cb, main_loop);
 
176
        g_unix_signal_add (SIGINT, on_shutdown_signal_cb, main_loop);
 
177
        g_unix_signal_add (SIGUSR2, on_sigusr2_cb, NULL);
243
178
 
244
179
        slave = gdm_simple_slave_new (display_id);
245
180
        if (slave == NULL) {
257
192
                g_object_unref (slave);
258
193
        }
259
194
 
260
 
        if (signal_handler != NULL) {
261
 
                g_object_unref (signal_handler);
262
 
        }
263
 
 
264
195
        g_main_loop_unref (main_loop);
265
196
 
266
197
 out: