Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-26 03:04:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merged revisions 76119 via svnmerge from

Browse source 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r76119 | antoine.pitrou | 2009-11-05 14:49:14 +0100 (jeu., 05 nov. 2009) | 10 lines

  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.
  ........
................
This commit is contained in:
Antoine Pitrou 2009-11-05 13:51:19 +00:00
parent 142d236442
commit a954607cd3
3 changed files with 12 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Lib/threading.py
View file

@ -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())