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

bpo-33329: Fix multiprocessing regression on newer glibcs (GH-6575) (GH-6579) 

Starting with glibc 2.27.9000-xxx, sigaddset() can return EINVAL for some
reserved signal numbers between 1 and NSIG.  The `range(1, NSIG)` idiom
is commonly used to select all signals for blocking with `pthread_sigmask`.
So we ignore the sigaddset() return value until we expose sigfillset()
to provide a better idiom.
(cherry picked from commit 25038ecfb6)

Co-authored-by: Antoine Pitrou <pitrou@free.fr>
This commit is contained in:
Miss Islington (bot) 2018-04-23 12:42:26 -07:00 committed by Antoine Pitrou
parent 9fc998d761
commit 75a3e3d5bc
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Misc/NEWS.d/next/Library/2018-04-23-13-21-39.bpo-33329.lQ-Eod.rst Normal file
View File

@ -0,0 +1 @@
Fix multiprocessing regression on newer glibcs

14
Modules/signalmodule.c
View File

@ -759,7 +759,6 @@ iterable_to_sigset(PyObject *iterable, sigset_t *mask)
int result = -1; int result = -1;
PyObject *iterator, *item; PyObject *iterator, *item;
long signum; long signum;
int err;
sigemptyset(mask); sigemptyset(mask);
@ -781,11 +780,14 @@ iterable_to_sigset(PyObject *iterable, sigset_t *mask)
Py_DECREF(item); Py_DECREF(item);
if (signum == -1 && PyErr_Occurred()) if (signum == -1 && PyErr_Occurred())
goto error; goto error;
if (0 < signum && signum < NSIG) if (0 < signum && signum < NSIG) {
err = sigaddset(mask, (int)signum); /* bpo-33329: ignore sigaddset() return value as it can fail
else * for some reserved signals, but we want the `range(1, NSIG)`
err = 1; * idiom to allow selecting all valid signals.
if (err) { */
(void) sigaddset(mask, (int)signum);
}
else {
PyErr_Format(PyExc_ValueError, PyErr_Format(PyExc_ValueError,
"signal number %ld out of range", signum); "signal number %ld out of range", signum);
goto error; goto error;