diff options
| author | Antoine Pitrou <solipsis@pitrou.net> | 2009-11-05 13:49:14 (GMT) |
|---|---|---|
| committer | Antoine Pitrou <solipsis@pitrou.net> | 2009-11-05 13:49:14 (GMT) |
| commit | bdec11fde7905c69c3bc67b0b0df86ae557d2236 (patch) | |
| tree | 7bc282fcadc3036b668b2f1291fbfa3a81226238 /Lib/threading.py | |
| parent | cfed029c42ba1f1129de0ff3e455fcaf1c7ef9c6 (diff) | |
| download | cpython-bdec11fde7905c69c3bc67b0b0df86ae557d2236.zip cpython-bdec11fde7905c69c3bc67b0b0df86ae557d2236.tar.gz cpython-bdec11fde7905c69c3bc67b0b0df86ae557d2236.tar.bz2 | |
Merged revisions 76117 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r76117 | antoine.pitrou | 2009-11-05 14:42:29 +0100 (jeu., 05 nov. 2009) | 5 lines
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.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Lib/threading.py b/Lib/threading.py index 88101b0..d5412e9 100644 --- a/Lib/threading.py +++ b/Lib/threading.py @@ -798,6 +798,10 @@ def active_count(): activeCount = active_count +def _enumerate(): + # Same as enumerate(), but without the lock. Internal use only. + return list(_active.values()) + list(_limbo.values()) + def enumerate(): with _active_limbo_lock: return list(_active.values()) + list(_limbo.values()) |