summaryrefslogtreecommitdiffstats
path: root/Lib/asyncio
diff options
context:
space:
mode:
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>2020-01-12 11:21:00 (GMT)
committerGitHub <noreply@github.com>2020-01-12 11:21:00 (GMT)
commit33dd75a28fe2ec6e85c5d3b315b5a9d4cf0652db (patch)
treefd5d1a43528130278260032f1617a8c55b0bc072 /Lib/asyncio
parenta240f0545653d961c67c1eb1597cb70b67f4e5f1 (diff)
downloadcpython-33dd75a28fe2ec6e85c5d3b315b5a9d4cf0652db.zip
cpython-33dd75a28fe2ec6e85c5d3b315b5a9d4cf0652db.tar.gz
cpython-33dd75a28fe2ec6e85c5d3b315b5a9d4cf0652db.tar.bz2
bpo-38356: Fix ThreadedChildWatcher thread leak in test_asyncio (GH-16552)
Motivation for this PR (comment from @vstinner in bpo issue): ``` Warning seen o AMD64 Ubuntu Shared 3.x buildbot: https://buildbot.python.org/all/GH-/builders/141/builds/2593 test_devnull_output (test.test_a=syncio.test_subprocess.SubprocessThreadedWatcherTests) ... Warning -- threading_cleanup() failed to cleanup 1 threads (count: 1, dangling: 2) ``` The following implementation details for the new method are TBD: 1) Public vs private 2) Inclusion in `close()` 3) Name 4) Coroutine vs subroutine method 5) *timeout* parameter If it's a private method, 3, 4, and 5 are significantly less important. I started with the most minimal implementation that fixes the dangling threads without modifying the regression tests, which I think is particularly important. I typically try to avoid directly modifying existing tests as much as possible unless it's necessary to do so. However, I am open to changing any part of this. https://bugs.python.org/issue38356 (cherry picked from commit 0ca7cc7fc0518c24dc9b78c38418e6064e64f148) Co-authored-by: Kyle Stanley <aeros167@gmail.com>
Diffstat (limited to 'Lib/asyncio')
-rw-r--r--Lib/asyncio/unix_events.py9
1 files changed, 8 insertions, 1 deletions
diff --git a/Lib/asyncio/unix_events.py b/Lib/asyncio/unix_events.py
index d8f6530..8c0a574 100644
--- a/Lib/asyncio/unix_events.py
+++ b/Lib/asyncio/unix_events.py
@@ -1266,7 +1266,14 @@ class ThreadedChildWatcher(AbstractChildWatcher):
return True
def close(self):
- pass
+ self._join_threads()
+
+ def _join_threads(self):
+ """Internal: Join all non-daemon threads"""
+ threads = [thread for thread in list(self._threads.values())
+ if thread.is_alive() and not thread.daemon]
+ for thread in threads:
+ thread.join()
def __enter__(self):
return self