traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "bpo-37788: Fix a reference leak if a thread is not joined (GH-15228)" (GH-15338) 

This reverts commit d3dcc92778.
This commit is contained in:
Victor Stinner 2019-08-20 00:47:07 +01:00 committed by GitHub
parent d3dcc92778
commit d11c2c6077
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 0 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Lib/test/test_threading.py
View File

@ -761,14 +761,6 @@ class ThreadTests(BaseTestCase):
# Daemon threads must never add it to _shutdown_locks. # Daemon threads must never add it to _shutdown_locks.
self.assertNotIn(tstate_lock, threading._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): class ThreadJoinOnShutdown(BaseTestCase):

10
Lib/threading.py
View File

@ -806,16 +806,6 @@ class Thread:
# For debugging and _after_fork() # For debugging and _after_fork()
_dangling.add(self) _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): def _reset_internal_locks(self, is_alive):
# private! Called by _after_fork() to reset our internal locks as # private! Called by _after_fork() to reset our internal locks as
# they may be in an invalid state leading to a deadlock or crash. # they may be in an invalid state leading to a deadlock or crash.

1
Misc/NEWS.d/next/Library/2019-08-12-17-21-10.bpo-37788.F0tR05.rst
View File

@ -1 +0,0 @@
Fix a reference leak if a thread is not joined.