diff options
author | Victor Stinner <vstinner@python.org> | 2020-03-09 22:37:49 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-03-09 22:37:49 (GMT) |
commit | 9ad58acbe8b90b4d0f2d2e139e38bb5aa32b7fb6 (patch) | |
tree | 7678fd0af5dc8c6922aee830e7f5b106dae23539 /Python/pylifecycle.c | |
parent | 8e9c47a947954c997d4b725f4551d50a1d896722 (diff) | |
download | cpython-9ad58acbe8b90b4d0f2d2e139e38bb5aa32b7fb6.zip cpython-9ad58acbe8b90b4d0f2d2e139e38bb5aa32b7fb6.tar.gz cpython-9ad58acbe8b90b4d0f2d2e139e38bb5aa32b7fb6.tar.bz2 |
bpo-19466: Py_Finalize() clears daemon threads earlier (GH-18848)
Clear the frames of daemon threads earlier during the Python shutdown to
call objects destructors. So "unclosed file" resource warnings are now
emitted for daemon threads in a more reliable way.
Cleanup _PyThreadState_DeleteExcept() code: rename "garbage" to
"list".
Diffstat (limited to 'Python/pylifecycle.c')
-rw-r--r-- | Python/pylifecycle.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/Python/pylifecycle.c b/Python/pylifecycle.c index c99c367..d00bf82 100644 --- a/Python/pylifecycle.c +++ b/Python/pylifecycle.c @@ -1373,6 +1373,16 @@ Py_FinalizeEx(void) runtime->initialized = 0; runtime->core_initialized = 0; + /* Destroy the state of all threads of the interpreter, except of the + current thread. In practice, only daemon threads should still be alive, + except if wait_for_thread_shutdown() has been cancelled by CTRL+C. + Clear frames of other threads to call objects destructors. Destructors + will be called in the current Python thread. Since + _PyRuntimeState_SetFinalizing() has been called, no other Python thread + can take the GIL at this point: if they try, they will exit + immediately. */ + _PyThreadState_DeleteExcept(runtime, tstate); + /* Flush sys.stdout and sys.stderr */ if (flush_std_files() < 0) { status = -1; |