diff options
author | nullptr <3621629+0x0L@users.noreply.github.com> | 2021-09-20 18:30:19 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-09-20 18:30:19 (GMT) |
commit | 0bfa1106acfcddc03590e1f5d6789dbad3affe70 (patch) | |
tree | 3fd58f08fd64ef7affed051a3ba3dbc0f86e5e18 /Lib/concurrent/futures | |
parent | 9510e6f3c797b4398aaf58abc1072b9db0a644f9 (diff) | |
download | cpython-0bfa1106acfcddc03590e1f5d6789dbad3affe70.zip cpython-0bfa1106acfcddc03590e1f5d6789dbad3affe70.tar.gz cpython-0bfa1106acfcddc03590e1f5d6789dbad3affe70.tar.bz2 |
bpo-45021: Fix a hang in forked children (GH-28007)
_global_shutdown_lock should be reinitialized in forked children
Diffstat (limited to 'Lib/concurrent/futures')
-rw-r--r-- | Lib/concurrent/futures/thread.py | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Lib/concurrent/futures/thread.py b/Lib/concurrent/futures/thread.py index b7a2cac..51c942f 100644 --- a/Lib/concurrent/futures/thread.py +++ b/Lib/concurrent/futures/thread.py @@ -36,6 +36,12 @@ def _python_exit(): # See bpo-39812 for context. threading._register_atexit(_python_exit) +# At fork, reinitialize the `_global_shutdown_lock` lock in the child process +if hasattr(os, 'register_at_fork'): + os.register_at_fork(before=_global_shutdown_lock.acquire, + after_in_child=_global_shutdown_lock._at_fork_reinit, + after_in_parent=_global_shutdown_lock.release) + class _WorkItem(object): def __init__(self, future, fn, args, kwargs): |