mirror of
https://github.com/python/cpython.git
synced 2025-08-02 08:02:56 +00:00
Issue #7264: Fix a possible deadlock when deallocating thread-local objects
which are part of a reference cycle.
This commit is contained in:
parent
2537e7a443
commit
99c160b559
3 changed files with 12 additions and 3 deletions
|
@ -218,10 +218,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
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue