1berry/cpython
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "gh-127586: properly restore blocked signals in resource_tracker.py (GH-127587)" (#127983)

Browse Source 
This reverts commit 46006a1b355f75d06c10e7b8086912c483b34487.
This commit is contained in:
Hugo van Kemenade 2024-12-16 20:18:02 +02:00 committed by GitHub
parent e4981e33b8
commit 1d276ec6f8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 3 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Lib/multiprocessing/resource_tracker.py
View File

@ -155,14 +155,13 @@ class ResourceTracker(object):
# that can make the child die before it registers signal handlers # that can make the child die before it registers signal handlers
# for SIGINT and SIGTERM. The mask is unregistered after spawning # for SIGINT and SIGTERM. The mask is unregistered after spawning
# the child. # the child.
prev_sigmask = None
try: try:
if _HAVE_SIGMASK: if _HAVE_SIGMASK:
prev_sigmask = signal.pthread_sigmask(signal.SIG_BLOCK, _IGNORED_SIGNALS) signal.pthread_sigmask(signal.SIG_BLOCK, _IGNORED_SIGNALS)
pid = util.spawnv_passfds(exe, args, fds_to_pass) pid = util.spawnv_passfds(exe, args, fds_to_pass)
finally: finally:
if prev_sigmask is not None: if _HAVE_SIGMASK:
signal.pthread_sigmask(signal.SIG_SETMASK, prev_sigmask) signal.pthread_sigmask(signal.SIG_UNBLOCK, _IGNORED_SIGNALS)
except: except:
os.close(w) os.close(w)
raise raise

15
Lib/test/_test_multiprocessing.py
View File

@ -6044,21 +6044,6 @@ class TestResourceTracker(unittest.TestCase):
self._test_resource_tracker_leak_resources( self._test_resource_tracker_leak_resources(
cleanup=cleanup, cleanup=cleanup,
) )
@unittest.skipUnless(hasattr(signal, "pthread_sigmask"), "pthread_sigmask is not available")
def test_resource_tracker_blocked_signals(self):
#
# gh-127586: Check that resource_tracker does not override blocked signals of caller.
#
from multiprocessing.resource_tracker import ResourceTracker
signals = {signal.SIGTERM, signal.SIGINT, signal.SIGUSR1}
for sig in signals:
signal.pthread_sigmask(signal.SIG_SETMASK, {sig})
self.assertEqual(signal.pthread_sigmask(signal.SIG_BLOCK, set()), {sig})
tracker = ResourceTracker()
tracker.ensure_running()
self.assertEqual(signal.pthread_sigmask(signal.SIG_BLOCK, set()), {sig})
tracker._stop()
class TestSimpleQueue(unittest.TestCase): class TestSimpleQueue(unittest.TestCase):

3
Misc/NEWS.d/next/Library/2024-12-03-20-28-08.gh-issue-127586.zgotYF.rst
View File

@ -1,3 +0,0 @@
:class:`multiprocessing.pool.Pool` now properly restores blocked signal handlers
of the parent thread when creating processes via either *spawn* or
*forkserver*.