(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 --git a/Misc/NEWS b/Misc/NEWS
index dda300f..a34f009 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -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 --git a/Modules/signalmodule.c b/Modules/signalmodule.c
index a93caad..d34f132 100644
--- a/Modules/signalmodule.c
+++ b/Modules/signalmodule.c
@@ -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