From 8fe57aacc7bf9d9af84803b69dbb1d66597934c6 Mon Sep 17 00:00:00 2001 From: "Miss Islington (bot)" <31488909+miss-islington@users.noreply.github.com> Date: Tue, 15 Jun 2021 09:30:26 -0700 Subject: bpo-44422: Fix threading.enumerate() reentrant call (GH-26727) (GH-26738) The threading.enumerate() function now uses a reentrant lock to prevent a hang on reentrant call. (cherry picked from commit 243fd01047ddce1a7eb0f99a49732d123e942c63) Co-authored-by: Victor Stinner --- Lib/threading.py | 9 ++++++--- .../NEWS.d/next/Library/2021-06-14-23-28-17.bpo-44422.BlWOgv.rst | 3 +++ 2 files changed, 9 insertions(+), 3 deletions(-) create mode 100644 Misc/NEWS.d/next/Library/2021-06-14-23-28-17.bpo-44422.BlWOgv.rst diff --git a/Lib/threading.py b/Lib/threading.py index 702acaa..a49775e 100644 --- a/Lib/threading.py +++ b/Lib/threading.py @@ -750,8 +750,11 @@ _counter() # Consume 0 so first non-main thread has id 1. def _newname(template="Thread-%d"): return template % _counter() -# Active thread administration -_active_limbo_lock = _allocate_lock() +# Active thread administration. +# +# bpo-44422: Use a reentrant lock to allow reentrant calls to functions like +# threading.enumerate(). +_active_limbo_lock = RLock() _active = {} # maps thread id to Thread object _limbo = {} _dangling = WeakSet() @@ -1474,7 +1477,7 @@ def _after_fork(): # by another (non-forked) thread. http://bugs.python.org/issue874900 global _active_limbo_lock, _main_thread global _shutdown_locks_lock, _shutdown_locks - _active_limbo_lock = _allocate_lock() + _active_limbo_lock = RLock() # fork() only copied the current thread; clear references to others. new_active = {} diff --git a/Misc/NEWS.d/next/Library/2021-06-14-23-28-17.bpo-44422.BlWOgv.rst b/Misc/NEWS.d/next/Library/2021-06-14-23-28-17.bpo-44422.BlWOgv.rst new file mode 100644 index 0000000..09bace0 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2021-06-14-23-28-17.bpo-44422.BlWOgv.rst @@ -0,0 +1,3 @@ +The :func:`threading.enumerate` function now uses a reentrant lock to +prevent a hang on reentrant call. +Patch by Victor Stinner. -- cgit v0.12