From 9ad58acbe8b90b4d0f2d2e139e38bb5aa32b7fb6 Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Mon, 9 Mar 2020 23:37:49 +0100 Subject: 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". --- Python/pylifecycle.c | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'Python/pylifecycle.c') diff --git a/Python/pylifecycle.c b/Python/pylifecycle.c index c99c3673d7..d00bf821c5 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; -- cgit v1.2.1