summaryrefslogtreecommitdiffstats
path: root/Lib/threading.py
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2009-11-05 13:42:29 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2009-11-05 13:42:29 (GMT)
commit99c160b559dc6c510e2e9f713191c3c80e26c6f2 (patch)
tree9b67f288cf29af2f7877bee0a99807c2a3778c18 /Lib/threading.py
parent2537e7a443bb1903cc79995d152b594264ff33d8 (diff)
downloadcpython-99c160b559dc6c510e2e9f713191c3c80e26c6f2.zip
cpython-99c160b559dc6c510e2e9f713191c3c80e26c6f2.tar.gz
cpython-99c160b559dc6c510e2e9f713191c3c80e26c6f2.tar.bz2
Issue #7264: Fix a possible deadlock when deallocating thread-local objects
which are part of a reference cycle.
Diffstat (limited to 'Lib/threading.py')
-rw-r--r--Lib/threading.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/Lib/threading.py b/Lib/threading.py
index cf20152..9ad5122 100644
--- 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()