brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't call meta_finalize from SIGTERM handler

Browse Source 
It's not a legal function to call from a signal handler.
Instead defer until going back to the main loop.

https://bugzilla.gnome.org/show_bug.cgi?id=600864
This commit is contained in:
Ray Strode 2009-11-05 14:47:47 -05:00
parent 1acefb9eac
commit ec7a3c516d
1 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/core/main.c
View File

@ -67,6 +67,7 @@
#include <fcntl.h> #include <fcntl.h>
#include <locale.h> #include <locale.h>
#include <time.h> #include <time.h>
#include <unistd.h>
/** /**
* The exit code we'll return to our parent process when we eventually die. * The exit code we'll return to our parent process when we eventually die.
@ -369,12 +370,24 @@ meta_finalize (void)
CurrentTime); /* I doubt correct timestamps matter here */ CurrentTime); /* I doubt correct timestamps matter here */
} }
static int sigterm_pipe_fds[2] = { -1, -1 };
static void static void
sigterm_handler (int signum) sigterm_handler (int signum)
{ {
meta_finalize (); if (sigterm_pipe_fds[1] >= 0)
{
write (sigterm_pipe_fds[1], "", 1);
close (sigterm_pipe_fds[1]);
sigterm_pipe_fds[1] = -1;
}
}
exit (meta_exit_code); static gboolean
on_sigterm (void)
{
meta_quit (META_EXIT_SUCCESS);
return FALSE;
} }
static guint sigchld_signal_id = 0; static guint sigchld_signal_id = 0;
@ -422,6 +435,7 @@ main (int argc, char **argv)
"Pango", "GLib-GObject", "GThread" "Pango", "GLib-GObject", "GThread"
}; };
guint i; guint i;
GIOChannel *channel;
if (!g_thread_supported ()) if (!g_thread_supported ())
g_thread_init (NULL); g_thread_init (NULL);
@ -444,6 +458,16 @@ main (int argc, char **argv)
g_strerror (errno)); g_strerror (errno));
#endif #endif
if (pipe (sigterm_pipe_fds) != 0)
g_printerr ("Failed to create SIGTERM pipe: %s\n",
g_strerror (errno));
channel = g_io_channel_unix_new (sigterm_pipe_fds[0]);
g_io_channel_set_flags (channel, G_IO_FLAG_NONBLOCK, NULL);
g_io_add_watch (channel, G_IO_IN, (GIOFunc) on_sigterm, NULL);
g_io_channel_set_close_on_unref (channel, TRUE);
g_io_channel_unref (channel);
act.sa_handler = &sigterm_handler; act.sa_handler = &sigterm_handler;
if (sigaction (SIGTERM, &act, NULL) < 0) if (sigaction (SIGTERM, &act, NULL) < 0)
g_printerr ("Failed to register SIGTERM handler: %s\n", g_printerr ("Failed to register SIGTERM handler: %s\n",