Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

gh-128639: Don't assume one thread in subinterpreter finalization #128640

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
merged 17 commits into from
May 19, 2025
Merged

gh-128639: Don't assume one thread in subinterpreter finalization #128640

Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
025cc17
Fix subinterpreter cleanup.
ZeroIntensity Jan 8, 2025
eea3ba9
Add and fix tests.
ZeroIntensity Jan 8, 2025
149e0cf
Add blurb
ZeroIntensity Jan 8, 2025
1761c37
Fix threading tests.
ZeroIntensity Jan 8, 2025
8febfbf
Fix test_embed.
ZeroIntensity Jan 8, 2025
5a73ce1
Remove buggy test.
ZeroIntensity Jan 8, 2025
a7cc3fe
Skip flaky test.
ZeroIntensity Jan 8, 2025
7c44c0b
Add an assertion.
ZeroIntensity Feb 4, 2025
6551bfa
Remove stray newline.
ZeroIntensity Feb 5, 2025
f19e28d
Add another assertion.
ZeroIntensity Feb 5, 2025
02da72a
Merge branch 'main' into subinterpreter-thread-shutdown
ZeroIntensity Feb 7, 2025
a759540
Merge branch 'main' of https://github.com/python/cpython into subinte…
ZeroIntensity Mar 28, 2025
76e4ec9
Use new is_after_fork parameter
ZeroIntensity Mar 28, 2025
1555731
Apply suggestions from code review
ZeroIntensity May 19, 2025
d61099e
Move call to finalize_subinterpreters()
ZeroIntensity May 19, 2025
09851dc
Unskip the threading test.
ZeroIntensity May 19, 2025
b223396
Add a comment for the test.
ZeroIntensity May 19, 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
Apply suggestions from code review 
Co-authored-by: Eric Snow <ericsnowcurrently@gmail.com>
  • Loading branch information
@ZeroIntensity @ericsnowcurrently
ZeroIntensity and ericsnowcurrently authored May 19, 2025
commit 1555731dc2ea6acb895f17f4e20d30fb9041dade
6 changes: 1 addition & 5 deletions 6 Python/pylifecycle.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1991,7 +1991,6 @@ resolve_final_tstate(_PyRuntimeState *runtime)

/* We might want to warn if main_tstate->current_frame != NULL. */

assert(main_tstate->interp == main_interp);
return main_tstate;
}

Expand All @@ -2007,8 +2006,6 @@ _Py_Finalize(_PyRuntimeState *runtime)

/* Get final thread state pointer. */
PyThreadState *tstate = resolve_final_tstate(runtime);
// We must be in the main interpreter
assert(tstate->interp == &runtime->_main_interpreter);

// Block some operations.
tstate->interp->finalizing = 1;
Expand Down Expand Up @@ -2513,8 +2510,7 @@ finalize_subinterpreters(void)
while (interp != NULL) {
/* Make a tstate for finalization. */
PyThreadState *tstate = _PyThreadState_NewBound(interp, _PyThreadState_WHENCE_FINI);
ericsnowcurrently marked this conversation as resolved.
Show resolved Hide resolved
if (tstate == NULL)
{
if (tstate == NULL) {
// XXX Some graceful way to always get a thread state?
Py_FatalError("thread state allocation failed");
ZeroIntensity marked this conversation as resolved.
Show resolved Hide resolved
}
Expand Down
Loading
Morty Proxy This is a proxified and sanitized view of the page, visit original site.