changeset:   69426:7d355c2ff3d4
branch:      2.7
parent:      69417:fc2def15ab11
user:        Victor Stinner <victor.stinner@haypocalc.com>
date:        Mon Apr 18 16:33:28 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 fc2def15ab11 -r 7d355c2ff3d4 Misc/NEWS
--- a/Misc/NEWS	Mon Apr 18 10:11:21 2011 +0300
+++ b/Misc/NEWS	Mon Apr 18 16:33:28 2011 +0200
@@ -55,6 +55,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 #11442: Add a charset parameter to the Content-type in SimpleHTTPServer
   to avoid XSS attacks.
 
diff -r fc2def15ab11 -r 7d355c2ff3d4 Modules/signalmodule.c
--- a/Modules/signalmodule.c	Mon Apr 18 10:11:21 2011 +0300
+++ b/Modules/signalmodule.c	Mon Apr 18 16:33:28 2011 +0200
@@ -167,6 +167,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;
@@ -183,13 +197,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
@@ -934,9 +942,7 @@
 void
 PyErr_SetInterrupt(void)
 {
-    is_tripped = 1;
-    Handlers[SIGINT].tripped = 1;
-    Py_AddPendingCall((int (*)(void *))PyErr_CheckSignals, NULL);
+    trip_signal(SIGINT);
 }
 
 void