Issue #7264: Fix a possible deadlock when deallocating thread-local objects

which are part of a reference cycle.

diff --git a/Lib/_threading_local.py b/Lib/_threading_local.py
index 4eda630bbdcf564dca2d36b21edf840e0af000a6..243d84ef7caf08fa14c083045e993dc8bf812332 100644 (file)
--- a/Lib/_threading_local.py
+++ b/Lib/_threading_local.py
@@ -218,10 +218,12 @@ class local(_localbase):
         key = object.__getattribute__(self, '_local__key')
 
         try:
-            threads = list(threading.enumerate())
+            # We use the non-locking API since we might already hold the lock
+            # (__del__ can be called at any point by the cyclic GC).
+            threads = threading._enumerate()
         except:
-            # If enumerate fails, as it seems to do during
-            # shutdown, we'll skip cleanup under the assumption
+            # If enumerating the current threads fails, as it seems to do
+            # during shutdown, we'll skip cleanup under the assumption
             # that there is nothing to clean up.
             return
 

diff --git a/Lib/threading.py b/Lib/threading.py
index cf20152b4d7ab37c542206989406087657910d5b..9ad5122c8f404009e72b002a4539587233aeb737 100644 (file)
--- a/Lib/threading.py
+++ b/Lib/threading.py
@@ -810,6 +810,10 @@ def activeCount():
 
 active_count = activeCount
 
+def _enumerate():
+    # Same as enumerate(), but without the lock. Internal use only.
+    return _active.values() + _limbo.values()
+
 def enumerate():
     with _active_limbo_lock:
         return _active.values() + _limbo.values()

diff --git a/Misc/NEWS b/Misc/NEWS
index 183aa7a588995b8c1d20de37b6b0a7c00b7f090e..8ae9afba4f7999819b62d3e05268833a5c118065 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -426,6 +426,9 @@ Core and Builtins
 Library
 -------
 
+- Issue #7264: Fix a possible deadlock when deallocating thread-local objects
+  which are part of a reference cycle.
+
 - Issue #7211: Allow 64-bit values for the `ident` and `data` fields of kevent
   objects on 64-bit systems.  Patch by Michael Broghton.