From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Tue, 15 Jun 2021 14:34:42 +0000 (-0700)
Subject: bpo-44422: Fix threading.enumerate() reentrant call (GH-26727)
X-Git-Tag: v3.10.0b3~10
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c3b776f83b4c765da6d7b8854e844e07bd33c375;p=thirdparty%2FPython%2Fcpython.git

bpo-44422: Fix threading.enumerate() reentrant call (GH-26727)


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 <vstinner@python.org>
---

diff --git a/Lib/threading.py b/Lib/threading.py
index 6c3d49c2d526..766011fa0312 100644
--- a/Lib/threading.py
+++ b/Lib/threading.py
@@ -775,8 +775,11 @@ _counter = _count(1).__next__
 def _newname(name_template):
     return name_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()
@@ -1564,7 +1567,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 000000000000..09bace01fc77
--- /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.