[Emacs-diffs] /srv/bzr/emacs/trunk r110168: Clean-up left-overs after revision 110152 wrt signal handling.

[Eli Zaretskii]

------------------------------------------------------------
revno: 110168
fixes bug: http://debbugs.gnu.org/12471
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Sun 2012-09-23 19:34:30 +0200
message:
  Clean-up left-overs after revision 110152 wrt signal handling.
  
   src/.gdbinit: Set breakpoint on terminate_due_to_signal, not on
   fatal_error_backtrace.
   src/w32proc.c (sys_kill): Undo last change: don't do anything when
   invoked to deliver SIGABRT to our own process.  This is now
   handled by emacs_raise.
  
   nt/inc/ms-w32.h (emacs_raise): Redefine to invoke emacs_abort.
modified:
  nt/ChangeLog
  nt/inc/ms-w32.h
  src/.gdbinit
  src/ChangeLog
  src/w32proc.c

=== modified file 'nt/ChangeLog'
--- a/nt/ChangeLog      2012-09-23 08:44:20 +0000
+++ b/nt/ChangeLog      2012-09-23 17:34:30 +0000
@@ -1,3 +1,7 @@
+2012-09-23  Eli Zaretskii  <address@hidden>
+
+       * inc/ms-w32.h (emacs_raise): Redefine to invoke emacs_abort.
+
 2012-09-23  Paul Eggert  <address@hidden>
 
        Simplify and avoid signal-handling races (Bug#12471).

=== modified file 'nt/inc/ms-w32.h'
--- a/nt/inc/ms-w32.h   2012-09-23 08:44:20 +0000
+++ b/nt/inc/ms-w32.h   2012-09-23 17:34:30 +0000
@@ -204,7 +204,7 @@
 #define signal  sys_signal
 
 /* Internal signals.  */
-#define emacs_raise(sig) kill (getpid (), sig)
+#define emacs_raise(sig) emacs_abort()
 
 /* termcap.c calls that are emulated.  */
 #define tputs   sys_tputs

=== modified file 'src/.gdbinit'
--- a/src/.gdbinit      2012-09-22 20:35:46 +0000
+++ b/src/.gdbinit      2012-09-23 17:34:30 +0000
@@ -1214,8 +1214,8 @@
 show environment TERM
 
 # When debugging, it is handy to be able to "return" from
-# fatal_error_backtrace when an assertion failure is non-fatal.
-break fatal_error_backtrace
+# terminate_due_to_signal when an assertion failure is non-fatal.
+break terminate_due_to_signal
 
 # x_error_quitter is defined only on X.  But window-system is set up
 # only at run time, during Emacs startup, so we need to defer setting

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-09-23 17:33:16 +0000
+++ b/src/ChangeLog     2012-09-23 17:34:30 +0000
@@ -1,3 +1,12 @@
+2012-09-23  Eli Zaretskii  <address@hidden>
+
+       * .gdbinit: Set breakpoint on terminate_due_to_signal, not on
+       fatal_error_backtrace.
+
+       * w32proc.c (sys_kill): Undo last change: don't do anything when
+       invoked to deliver SIGABRT to our own process.  This is now
+       handled by emacs_raise.
+
 2012-09-23  Juanma Barranquero  <address@hidden>
 
        * w32term.c (w32_read_socket): Remove leftover reference to

=== modified file 'src/w32proc.c'
--- a/src/w32proc.c     2012-09-15 08:03:11 +0000
+++ b/src/w32proc.c     2012-09-23 17:34:30 +0000
@@ -1428,9 +1428,6 @@
   int need_to_free = 0;
   int rc = 0;
 
-  if (pid == getpid () && sig == SIGABRT)
-    emacs_abort ();
-
   /* Only handle signals that will result in the process dying */
   if (sig != SIGINT && sig != SIGKILL && sig != SIGQUIT && sig != SIGHUP)
     {