python-checkins at python
Nov 5, 2009, 6:20 AM
Post #1 of 1
(116 views)
Permalink
|
|
r76119 - in python/branches/py3k: Lib/_threading_local.py Lib/threading.py Misc/NEWS
|
|
Author: antoine.pitrou
Date: Thu Nov 5 14:49:14 2009
New Revision: 76119
Log:
Merged revisions 76117 via svnmerge from
svn+ssh://pythondev [at] svn/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.
........
Modified:
python/branches/py3k/ (props changed)
python/branches/py3k/Lib/_threading_local.py
python/branches/py3k/Lib/threading.py
python/branches/py3k/Misc/NEWS
Modified: python/branches/py3k/Lib/_threading_local.py
==============================================================================
--- python/branches/py3k/Lib/_threading_local.py (original)
+++ python/branches/py3k/Lib/_threading_local.py Thu Nov 5 14:49:14 2009
@@ -217,10 +217,12 @@
key = object.__getattribute__(self, '_local__key')
try:
- threads = list(threading.enumerate())
+ # We use the non-locking API since we might already hold the lock
+ # (__del__ can be called at any point by the cyclic GC).
+ threads = threading._enumerate()
except:
- # If enumerate fails, as it seems to do during
- # shutdown, we'll skip cleanup under the assumption
+ # If enumerating the current threads fails, as it seems to do
+ # during shutdown, we'll skip cleanup under the assumption
# that there is nothing to clean up.
return
Modified: python/branches/py3k/Lib/threading.py
==============================================================================
--- python/branches/py3k/Lib/threading.py (original)
+++ python/branches/py3k/Lib/threading.py Thu Nov 5 14:49:14 2009
@@ -798,6 +798,10 @@
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())
Modified: python/branches/py3k/Misc/NEWS
==============================================================================
--- python/branches/py3k/Misc/NEWS (original)
+++ python/branches/py3k/Misc/NEWS Thu Nov 5 14:49:14 2009
@@ -123,6 +123,9 @@
Library
-------
+- Issue #7264: Fix a possible deadlock when deallocating thread-local objects
+ which are part of a reference cycle.
+
- Issue #7211: Allow 64-bit values for the `ident` and `data` fields of kevent
objects on 64-bit systems. Patch by Michael Broghton.
_______________________________________________
Python-checkins mailing list
Python-checkins [at] python
http://mail.python.org/mailman/listinfo/python-checkins
|
