Skip to content

gh-105716: Update interp->threads.main After Fork #117049

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 2 commits into from
Mar 21, 2024
Merged

gh-105716: Update interp->threads.main After Fork #117049

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2cda955
Add _PyInterpreterState_ReinitRunningMain().
ericsnowcurrently Mar 19, 2024
a7a1d1e
is_running_main() is only used in asserts.
ericsnowcurrently Mar 20, 2024
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
3 changes: 3 additions & 0 deletions Include/internal/pycore_pystate.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,9 @@ PyAPI_FUNC(void) _PyInterpreterState_SetNotRunningMain(PyInterpreterState *);
PyAPI_FUNC(int) _PyInterpreterState_IsRunningMain(PyInterpreterState *);
PyAPI_FUNC(int) _PyInterpreterState_FailIfRunningMain(PyInterpreterState *);

extern int _PyThreadState_IsRunningMain(PyThreadState *);
extern void _PyInterpreterState_ReinitRunningMain(PyThreadState *);


static inline const PyConfig *
_Py_GetMainConfig(void)
Expand Down
4 changes: 4 additions & 0 deletions Modules/posixmodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -640,6 +640,7 @@ PyOS_AfterFork_Child(void)
PyThreadState *tstate = _PyThreadState_GET();
_Py_EnsureTstateNotNULL(tstate);

assert(tstate->thread_id == PyThread_get_thread_ident());
#ifdef PY_HAVE_THREAD_NATIVE_ID
tstate->native_thread_id = PyThread_get_thread_native_id();
#endif
Expand All @@ -649,6 +650,9 @@ PyOS_AfterFork_Child(void)
_Py_qsbr_after_fork((_PyThreadStateImpl *)tstate);
#endif

// Ideally we could guarantee tstate is running main.
_PyInterpreterState_ReinitRunningMain(tstate);

status = _PyEval_ReInitThreads(tstate);
if (_PyStatus_EXCEPTION(status)) {
goto fatal_error;
Expand Down
4 changes: 4 additions & 0 deletions Python/pylifecycle.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3135,6 +3135,10 @@ call_ll_exitfuncs(_PyRuntimeState *runtime)
void _Py_NO_RETURN
Py_Exit(int sts)
{
PyThreadState *tstate = _PyThreadState_GET();
if (tstate != NULL && _PyThreadState_IsRunningMain(tstate)) {
_PyInterpreterState_SetNotRunningMain(tstate->interp);
}
if (Py_FinalizeEx() < 0) {
sts = 120;
}
Expand Down
35 changes: 35 additions & 0 deletions Python/pystate.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1048,6 +1048,30 @@ _PyInterpreterState_IsRunningMain(PyInterpreterState *interp)
return 0;
}

#ifndef NDEBUG
static int
is_running_main(PyThreadState *tstate)
{
if (tstate->interp->threads.main != NULL) {
return tstate == tstate->interp->threads.main;
}
return 0;
}
#endif

int
_PyThreadState_IsRunningMain(PyThreadState *tstate)
{
PyInterpreterState *interp = tstate->interp;
if (interp->threads.main != NULL) {
return tstate == interp->threads.main;
}
if (_Py_IsMainInterpreter(interp)) {
return tstate->thread_id == interp->runtime->main_thread;
}
return 0;
}

int
_PyInterpreterState_FailIfRunningMain(PyInterpreterState *interp)
{
Expand All @@ -1059,6 +1083,15 @@ _PyInterpreterState_FailIfRunningMain(PyInterpreterState *interp)
return 0;
}

void
_PyInterpreterState_ReinitRunningMain(PyThreadState *tstate)
{
PyInterpreterState *interp = tstate->interp;
if (interp->threads.main != tstate) {
interp->threads.main = NULL;
}
}


//----------
// accessors
Expand Down Expand Up @@ -1488,6 +1521,7 @@ PyThreadState_Clear(PyThreadState *tstate)
{
assert(tstate->_status.initialized && !tstate->_status.cleared);
assert(current_fast_get()->interp == tstate->interp);
assert(!is_running_main(tstate));
// XXX assert(!tstate->_status.bound || tstate->_status.unbound);
tstate->_status.finalizing = 1; // just in case

Expand Down Expand Up @@ -1586,6 +1620,7 @@ tstate_delete_common(PyThreadState *tstate)
assert(tstate->_status.cleared && !tstate->_status.finalized);
assert(tstate->state != _Py_THREAD_ATTACHED);
tstate_verify_not_active(tstate);
assert(!is_running_main(tstate));

PyInterpreterState *interp = tstate->interp;
if (interp == NULL) {
Expand Down