diff options
| author | Antoine Pitrou <solipsis@pitrou.net> | 2009-11-05 13:51:19 (GMT) |
|---|---|---|
| committer | Antoine Pitrou <solipsis@pitrou.net> | 2009-11-05 13:51:19 (GMT) |
| commit | a954607cd3c27bc55d3f42af54d0ba1636f357a9 (patch) | |
| tree | c74a458560abaadd349c24755ab58ddaab5f78fe | |
| parent | 142d236442a52f458f6fece1c29e2cd8678cfd23 (diff) | |
| download | cpython-a954607cd3c27bc55d3f42af54d0ba1636f357a9.zip cpython-a954607cd3c27bc55d3f42af54d0ba1636f357a9.tar.gz cpython-a954607cd3c27bc55d3f42af54d0ba1636f357a9.tar.bz2 | |
Merged revisions 76119 via svnmerge from
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.
........
................
| -rw-r--r-- | Lib/_threading_local.py | 8 | ||||
| -rw-r--r-- | Lib/threading.py | 4 | ||||
| -rw-r--r-- | Misc/NEWS | 3 |
3 files changed, 12 insertions, 3 deletions
diff --git a/Lib/_threading_local.py b/Lib/_threading_local.py index 6d77035..6e8a8d8 100644 --- a/Lib/_threading_local.py +++ b/Lib/_threading_local.py @@ -217,10 +217,12 @@ class local(_localbase): 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 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()) @@ -40,6 +40,9 @@ Core and Builtins Library ------- +- Issue #7264: Fix a possible deadlock when deallocating thread-local objects + which are part of a reference cycle. + - Issue #6896: mailbox.Maildir now invalidates its internal cache each time a modification is done through it. This fixes inconsistencies and test failures on systems with slightly bogus mtime behaviour. |