Skip to content

gh-109793: Allow Switching Interpreters During Finalization #109794

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 9 commits into from
Sep 27, 2023
Merged

gh-109793: Allow Switching Interpreters During Finalization #109794

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
5e2224f
Add a test.
ericsnowcurrently Sep 23, 2023
a1014a9
Also check the thread ID in _PyThreadState_MustExit().
ericsnowcurrently Sep 23, 2023
d46103d
Use _PyRuntime directly in _Py_IsMainInterpreterFinalizing().
ericsnowcurrently Sep 23, 2023
2e13a75
Add _PyRuntimeState._finalizing_id and _PyInterpreterState._finalizin…
ericsnowcurrently Sep 24, 2023
756cc3b
Add verbose output to the test.
ericsnowcurrently Sep 25, 2023
ad312b9
Add a NEWS entry.
ericsnowcurrently Sep 25, 2023
8feeb4c
Skip the assert for now.
ericsnowcurrently Sep 25, 2023
9e589a7
Use the new _Py_atomic API.
ericsnowcurrently Sep 27, 2023
9829315
Fix the NEWS entry.
ericsnowcurrently Sep 27, 2023
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
Also check the thread ID in _PyThreadState_MustExit().
  • Loading branch information
@ericsnowcurrently
ericsnowcurrently committed Sep 23, 2023
commit a1014a924ce126707d6b525eef5794a45eb19deb
12 changes: 11 additions & 1 deletion Python/pystate.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2968,7 +2968,17 @@ _PyThreadState_MustExit(PyThreadState *tstate)
if (finalizing == NULL) {
finalizing = _PyInterpreterState_GetFinalizing(tstate->interp);
}
return (finalizing != NULL && finalizing != tstate);
if (finalizing == NULL) {
return 0;
}
else if (finalizing == tstate) {
return 0;
}
else if (finalizing->thread_id == tstate->thread_id) {
/* gh-109793: we must have switched interpreters. */
return 0;
}
return 1;
}


Expand Down