diff options
| author | Antoine Pitrou <solipsis@pitrou.net> | 2009-11-05 13:44:28 (GMT) |
|---|---|---|
| committer | Antoine Pitrou <solipsis@pitrou.net> | 2009-11-05 13:44:28 (GMT) |
| commit | 4fb961cf3edac893267d3ad74410dd5cc1859a11 (patch) | |
| tree | 769b3a61e97847577dac4ae515f7e6bd6c479db8 /Lib/threading.py | |
| parent | 35465af487d19ed622148b171252f78667330b5a (diff) | |
| download | cpython-4fb961cf3edac893267d3ad74410dd5cc1859a11.zip cpython-4fb961cf3edac893267d3ad74410dd5cc1859a11.tar.gz cpython-4fb961cf3edac893267d3ad74410dd5cc1859a11.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 1182f19..18c28b7 100644 --- a/Lib/threading.py +++ b/Lib/threading.py @@ -815,6 +815,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(): _active_limbo_lock.acquire() active = _active.values() + _limbo.values() |