changeset:   69424:28ab8c6ad8f9
branch:      3.2
parent:      69421:51a551acb60d
parent:      69423:319f7af9ee5e
user:        Victor Stinner <victor.stinner@haypocalc.com>
date:        Mon Apr 18 16:28:39 2011 +0200
files:       Misc/NEWS Modules/signalmodule.c
description:
(Merge 3.1) Issue #11768: The signal handler of the signal module only calls
Py_AddPendingCall() for the first signal to fix a deadlock on reentrant or
parallel calls. PyErr_SetInterrupt() writes also into the wake up file.


diff -r 51a551acb60d -r 28ab8c6ad8f9 Misc/NEWS
--- a/Misc/NEWS	Mon Apr 18 10:04:34 2011 -0400
+++ b/Misc/NEWS	Mon Apr 18 16:28:39 2011 +0200
@@ -60,6 +60,10 @@
 Library
 -------
 
+- Issue #11768: The signal handler of the signal module only calls
+  Py_AddPendingCall() for the first signal to fix a deadlock on reentrant or
+  parallel calls. PyErr_SetInterrupt() writes also into the wake up file.
+
 - Issue #11492: fix several issues with header folding in the email package.
 
 - Issue #11852: Add missing imports and update tests.
diff -r 51a551acb60d -r 28ab8c6ad8f9 Modules/signalmodule.c
--- a/Modules/signalmodule.c	Mon Apr 18 10:04:34 2011 -0400
+++ b/Modules/signalmodule.c	Mon Apr 18 16:28:39 2011 +0200
@@ -166,6 +166,20 @@
 }
 
 static void
+trip_signal(int sig_num)
+{
+    Handlers[sig_num].tripped = 1;
+    if (is_tripped)
+        return;
+    /* Set is_tripped after setting .tripped, as it gets
+       cleared in PyErr_CheckSignals() before .tripped. */
+    is_tripped = 1;
+    Py_AddPendingCall(checksignals_witharg, NULL);
+    if (wakeup_fd != -1)
+        write(wakeup_fd, "\0", 1);
+}
+
+static void
 signal_handler(int sig_num)
 {
     int save_errno = errno;
@@ -182,13 +196,7 @@
     if (getpid() == main_pid)
 #endif
     {
-        Handlers[sig_num].tripped = 1;
-        /* Set is_tripped after setting .tripped, as it gets
-           cleared in PyErr_CheckSignals() before .tripped. */
-        is_tripped = 1;
-        Py_AddPendingCall(checksignals_witharg, NULL);
-        if (wakeup_fd != -1)
-            write(wakeup_fd, "\0", 1);
+        trip_signal(sig_num);
     }
 
 #ifndef HAVE_SIGACTION
@@ -946,9 +954,7 @@
 void
 PyErr_SetInterrupt(void)
 {
-    is_tripped = 1;
-    Handlers[SIGINT].tripped = 1;
-    Py_AddPendingCall((int (*)(void *))PyErr_CheckSignals, NULL);
+    trip_signal(SIGINT);
 }
 
 void