Browse Source
bpo-37788: Fix a reference leak if a thread is not joined (GH-15228)
Add threading.Thread.__del__() method to ensure that the thread state
lock is removed from the _shutdown_locks list when a thread
completes.
pull/15338/head
Victor Stinner
6 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with
19 additions and
0 deletions
-
Lib/test/test_threading.py
-
Lib/threading.py
-
Misc/NEWS.d/next/Library/2019-08-12-17-21-10.bpo-37788.F0tR05.rst
|
|
|
@ -761,6 +761,14 @@ class ThreadTests(BaseTestCase): |
|
|
|
# Daemon threads must never add it to _shutdown_locks. |
|
|
|
self.assertNotIn(tstate_lock, threading._shutdown_locks) |
|
|
|
|
|
|
|
def test_leak_without_join(self): |
|
|
|
# bpo-37788: Test that a thread which is not joined explicitly |
|
|
|
# does not leak. Test written for reference leak checks. |
|
|
|
def noop(): pass |
|
|
|
with support.wait_threads_exit(): |
|
|
|
threading.Thread(target=noop).start() |
|
|
|
# Thread.join() is not called |
|
|
|
|
|
|
|
|
|
|
|
class ThreadJoinOnShutdown(BaseTestCase): |
|
|
|
|
|
|
|
|
|
|
|
@ -806,6 +806,16 @@ class Thread: |
|
|
|
# For debugging and _after_fork() |
|
|
|
_dangling.add(self) |
|
|
|
|
|
|
|
def __del__(self): |
|
|
|
if not self._initialized: |
|
|
|
return |
|
|
|
lock = self._tstate_lock |
|
|
|
if lock is not None and not self.daemon: |
|
|
|
# ensure that self._tstate_lock is not in _shutdown_locks |
|
|
|
# if join() was not called explicitly |
|
|
|
with _shutdown_locks_lock: |
|
|
|
_shutdown_locks.discard(lock) |
|
|
|
|
|
|
|
def _reset_internal_locks(self, is_alive): |
|
|
|
# private! Called by _after_fork() to reset our internal locks as |
|
|
|
# they may be in an invalid state leading to a deadlock or crash. |
|
|
|
|
|
|
|
@ -0,0 +1 @@ |
|
|
|
Fix a reference leak if a thread is not joined. |