Skip to content

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

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

Show file tree
Hide file tree
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
Fix test_embed.
  • Loading branch information
@ZeroIntensity
ZeroIntensity committed Jan 8, 2025
commit 8febfbfcd7c82e9c2ce1b152d49cd40af6a74587
9 changes: 6 additions & 3 deletions Programs/_testembed.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1424,9 +1424,12 @@ static int test_audit_subinterpreter(void)
PySys_AddAuditHook(_audit_subinterpreter_hook, NULL);
_testembed_Py_InitializeFromConfig();

Py_NewInterpreter();
Py_NewInterpreter();
Py_NewInterpreter();
PyThreadState *tstate = PyThreadState_Get();
Copy link
Copy Markdown
Member Author

@ZeroIntensity ZeroIntensity Jan 8, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this test working before was a fluke. Py_NewInterpreter changes the thread state, and I don't think we support calling Py_Finalize from a subinterpreter.

Copy link
Copy Markdown
Member

@ericsnowcurrently ericsnowcurrently May 19, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's probably okay but your change helps future-proof the test.

for (int i = 0; i < 3; ++i)
{
Py_EndInterpreter(Py_NewInterpreter());
PyThreadState_Swap(tstate);
}

Py_Finalize();

Expand Down
5 changes: 2 additions & 3 deletions Python/pylifecycle.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2414,9 +2414,8 @@ Py_NewInterpreter(void)
return tstate;
}

/* Delete an interpreter and its last thread. This requires that the
given thread state is current, that the thread has no remaining
frames, and that it is its interpreter's only remaining thread.
/* Delete an interpreter. This requires that the given thread state
is current, and that the thread has no remaining frames.
Comment thread
ericsnowcurrently marked this conversation as resolved.
It is a fatal error to violate these constraints.

(Py_FinalizeEx() doesn't have these constraints -- it zaps
Expand Down