Skip to content

gh-128639: Don't assume one thread in subinterpreter finalization with fixed daemon thread support #134606

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ZeroIntensity merged 13 commits into from
Sep 17, 2025
Merged

gh-128639: Don't assume one thread in subinterpreter finalization with fixed daemon thread support #134606

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
b14aa73
Reapply "gh-128639: Don't assume one thread in subinterpreter finaliz…
ZeroIntensity May 22, 2025
91d94d9
Fix daemon thread shutdown.
ZeroIntensity May 24, 2025
a569355
Stop the runtime instead of the interpreter.
ZeroIntensity May 24, 2025
0146aec
Merge branch 'main' into fix-subinterp-thread-shutdown
ZeroIntensity May 24, 2025
f85a291
Run the daemon thread test in a subprocess.
ZeroIntensity May 25, 2025
d287d54
Update Lib/test/test_interpreters/test_api.py
ZeroIntensity May 27, 2025
fe7a342
Merge branch 'main' into fix-subinterp-thread-shutdown
ZeroIntensity May 27, 2025
193c49a
Merge branch 'main' of https://github.com/python/cpython into fix-sub…
ZeroIntensity Jun 8, 2025
62bd653
Remove broken assertion.
ZeroIntensity Jun 8, 2025
b029dd5
Avoid using list comprehensions in the tests.
ZeroIntensity Jun 13, 2025
88b1cf6
Merge branch 'main' of https://github.com/python/cpython into fix-sub…
ZeroIntensity Jul 12, 2025
a8de87c
Merge branch 'main' of https://github.com/python/cpython into fix-sub…
ZeroIntensity Sep 15, 2025
6acb265
Merge branch 'main' into fix-subinterp-thread-shutdown
ZeroIntensity Sep 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix daemon thread shutdown.
  • Loading branch information
@ZeroIntensity
ZeroIntensity committed May 24, 2025
commit 91d94d9ee736795c7cc2d8ab3412be7ba9f8a29b
2 changes: 1 addition & 1 deletion Lib/test/test_interpreters/test_api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -691,7 +691,7 @@ def test_remaining_daemon_threads(self):
import time

def task():
time.sleep(100)
time.sleep(3)

threads = [threading.Thread(target=task, daemon=True) for _ in range(3)]
for t in threads:
Expand Down
13 changes: 8 additions & 5 deletions Python/pylifecycle.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2449,14 +2449,17 @@ Py_EndInterpreter(PyThreadState *tstate)
_Py_FinishPendingCalls(tstate);

_PyAtExit_Call(tstate->interp);
_PyRuntimeState *runtime = interp->runtime;
_PyEval_StopTheWorldAll(runtime);
PyThreadState *list = _PyThreadState_RemoveExcept(tstate);

_PyEval_StopTheWorld(interp);
/* Remaining daemon threads will automatically exit
when they attempt to take the GIL (ex: PyEval_RestoreThread()). */
_PyInterpreterState_SetFinalizing(interp, tstate);
_PyEval_StartTheWorldAll(runtime);

PyThreadState *list = _PyThreadState_RemoveExcept(tstate);
for (PyThreadState *p = list; p != NULL; p = p->next) {
_PyThreadState_SetShuttingDown(p);
}

_PyEval_StartTheWorld(interp);
_PyThreadState_DeleteList(list, /*is_after_fork=*/0);

// XXX Call something like _PyImport_Disable() here?
Comment thread
ericsnowcurrently marked this conversation as resolved.
Expand Down
Loading