traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

(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.
This commit is contained in:
Victor Stinner 2011-04-18 16:28:39 +02:00
parent 01581ee0b7 6c9b35bfe2
commit 27026f87d8
2 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Misc/NEWS
View File

@ -60,6 +60,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 #11492: fix several issues with header folding in the email package.
- Issue #11852: Add missing imports and update tests.

26
Modules/signalmodule.c
View File

@ -165,6 +165,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)
{
@ -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