From 33feeab598f5b0926a2835837c70c257f9be6749 Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Mon, 18 Apr 2011 16:33:28 +0200 Subject: [PATCH] (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. --- Misc/NEWS | 4 ++++ Modules/signalmodule.c | 26 ++++++++++++++++---------- 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/Misc/NEWS b/Misc/NEWS index 738139709ada..ad532abda96d 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -55,6 +55,10 @@ Core and Builtins 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 --git a/Modules/signalmodule.c b/Modules/signalmodule.c index 24410996eeb5..f306bba16f53 100644 --- a/Modules/signalmodule.c +++ b/Modules/signalmodule.c @@ -166,6 +166,20 @@ checksignals_witharg(void * unused) return PyErr_CheckSignals(); } +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) { @@ -183,13 +197,7 @@ signal_handler(int sig_num) 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 @@ PyErr_CheckSignals(void) void PyErr_SetInterrupt(void) { - is_tripped = 1; - Handlers[SIGINT].tripped = 1; - Py_AddPendingCall((int (*)(void *))PyErr_CheckSignals, NULL); + trip_signal(SIGINT); } void -- 2.47.3