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:49:14 +00:00
parent cfed029c42
commit bdec11fde7
3 changed files with 12 additions and 3 deletions

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