diff options
| author | Victor Stinner <victor.stinner@haypocalc.com> | 2011-04-18 14:30:17 (GMT) |
|---|---|---|
| committer | Victor Stinner <victor.stinner@haypocalc.com> | 2011-04-18 14:30:17 (GMT) |
| commit | ce16be91dc68597b0c5bfc7b4b1c5136fe5697a6 (patch) | |
| tree | 5d91e3854a67afbb2a7760b3d541cc2c3331db56 /Modules | |
| parent | f3299989a213f8e2f174defc1174ab2acf8ec322 (diff) | |
| parent | 27026f87d8aba31c3aa5529971508a91017486f5 (diff) | |
| download | cpython-ce16be91dc68597b0c5bfc7b4b1c5136fe5697a6.zip cpython-ce16be91dc68597b0c5bfc7b4b1c5136fe5697a6.tar.gz cpython-ce16be91dc68597b0c5bfc7b4b1c5136fe5697a6.tar.bz2 | |
(Merge 3.2) 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.
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/signalmodule.c | 26 |
1 files changed, 16 insertions, 10 deletions
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 @@ checksignals_witharg(void * unused) } 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 @@ 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 @@ -946,9 +954,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 |