[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r112859: Chain glib's SIGCHLD handler
From: |
Paul Eggert |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r112859: Chain glib's SIGCHLD handler from Emacs's (Bug#14474). |
Date: |
Wed, 05 Jun 2013 10:04:13 -0700 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 112859
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Wed 2013-06-05 10:04:13 -0700
message:
Chain glib's SIGCHLD handler from Emacs's (Bug#14474).
* process.c (dummy_handler): New function.
(lib_child_handler): New static var.
(handle_child_signal): Invoke it.
(catch_child_signal): If a library has set up a signal handler,
save it into lib_child_handler.
(init_process_emacs): If using glib and not on Windows, tickle glib's
child-handling code so that it initializes its private SIGCHLD handler.
* syssignal.h (SA_SIGINFO): Default to 0.
* xterm.c (x_term_init): Remove D-bus hack that I installed on May
31; it should no longer be needed now.
modified:
src/ChangeLog
src/process.c
src/syssignal.h
src/xterm.c
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2013-06-05 12:17:02 +0000
+++ b/src/ChangeLog 2013-06-05 17:04:13 +0000
@@ -1,3 +1,17 @@
+2013-06-05 Paul Eggert <address@hidden>
+
+ Chain glib's SIGCHLD handler from Emacs's (Bug#14474).
+ * process.c (dummy_handler): New function.
+ (lib_child_handler): New static var.
+ (handle_child_signal): Invoke it.
+ (catch_child_signal): If a library has set up a signal handler,
+ save it into lib_child_handler.
+ (init_process_emacs): If using glib and not on Windows, tickle glib's
+ child-handling code so that it initializes its private SIGCHLD handler.
+ * syssignal.h (SA_SIGINFO): Default to 0.
+ * xterm.c (x_term_init): Remove D-bus hack that I installed on May
+ 31; it should no longer be needed now.
+
2013-06-05 Michael Albinus <address@hidden>
* emacs.c (main) [HAVE_GFILENOTIFY]: Call globals_of_gfilenotify.
=== modified file 'src/process.c'
--- a/src/process.c 2013-06-03 18:47:35 +0000
+++ b/src/process.c 2013-06-05 17:04:13 +0000
@@ -6100,6 +6100,12 @@
might inadvertently reap a GTK-created process that happened to
have the same process ID. */
+/* LIB_CHILD_HANDLER is a SIGCHLD handler that Emacs calls while doing
+ its own SIGCHLD handling. On POSIXish systems, glib needs this to
+ keep track of its own children. The default handler does nothing. */
+static void dummy_handler (int sig) {}
+static signal_handler_t volatile lib_child_handler = dummy_handler;
+
/* Handle a SIGCHLD signal by looking for known child processes of
Emacs whose status have changed. For each one found, record its
new status.
@@ -6184,6 +6190,8 @@
}
}
}
+
+ lib_child_handler (sig);
}
static void
@@ -7035,9 +7043,13 @@
void
catch_child_signal (void)
{
- struct sigaction action;
+ struct sigaction action, old_action;
emacs_sigaction_init (&action, deliver_child_signal);
- sigaction (SIGCHLD, &action, 0);
+ sigaction (SIGCHLD, &action, &old_action);
+ eassert (! (old_action.sa_flags & SA_SIGINFO));
+ if (old_action.sa_handler != SIG_DFL && old_action.sa_handler != SIG_IGN
+ && old_action.sa_handler != deliver_child_signal)
+ lib_child_handler = old_action.sa_handler;
}
@@ -7055,6 +7067,11 @@
if (! noninteractive || initialized)
#endif
{
+#if defined HAVE_GLIB && !defined WINDOWSNT
+ /* Tickle glib's child-handling code so that it initializes its
+ private SIGCHLD handler. */
+ g_source_unref (g_child_watch_source_new (0));
+#endif
catch_child_signal ();
}
=== modified file 'src/syssignal.h'
--- a/src/syssignal.h 2013-01-02 16:13:04 +0000
+++ b/src/syssignal.h 2013-06-05 17:04:13 +0000
@@ -50,6 +50,10 @@
# define NSIG NSIG_MINIMUM
#endif
+#ifndef SA_SIGINFO
+# define SA_SIGINFO 0
+#endif
+
#ifndef emacs_raise
# define emacs_raise(sig) raise (sig)
#endif
=== modified file 'src/xterm.c'
--- a/src/xterm.c 2013-05-31 01:41:52 +0000
+++ b/src/xterm.c 2013-06-05 17:04:13 +0000
@@ -9897,13 +9897,6 @@
XSetLocaleModifiers ("");
- /* If D-Bus is not already configured, inhibit D-Bus autolaunch,
- as autolaunch can mess up Emacs's SIGCHLD handler.
- FIXME: Rewrite subprocess handlers to use glib's child watchers.
- See Bug#14474. */
- if (! egetenv ("DBUS_SESSION_BUS_ADDRESS"))
- xputenv ("DBUS_SESSION_BUS_ADDRESS=unix:path=/dev/null");
-
/* Emacs can only handle core input events, so make sure
Gtk doesn't use Xinput or Xinput2 extensions. */
xputenv ("GDK_CORE_DEVICE_EVENTS=1");
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r112859: Chain glib's SIGCHLD handler from Emacs's (Bug#14474).,
Paul Eggert <=