Skip to content

bpo-38858: Fix Py_Finalize() when called from a subinterpreter #17297

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
vstinner merged 1 commit into from
Nov 20, 2019
Merged

bpo-38858: Fix Py_Finalize() when called from a subinterpreter #17297

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
29 changes: 18 additions & 11 deletions Python/pylifecycle.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -558,9 +558,10 @@ pycore_create_interpreter(_PyRuntimeState *runtime,


static PyStatus
pycore_init_types(PyThreadState *tstate, int is_main_interp)
pycore_init_types(PyThreadState *tstate)
{
PyStatus status;
int is_main_interp = _Py_IsMainInterpreter(tstate);

status = _PyGC_Init(tstate);
if (_PyStatus_EXCEPTION(status)) {
Expand All @@ -576,7 +577,9 @@ pycore_init_types(PyThreadState *tstate, int is_main_interp)
if (!_PyLong_Init()) {
return _PyStatus_ERR("can't init longs");
}
}

if (is_main_interp) {
status = _PyUnicode_Init();
if (_PyStatus_EXCEPTION(status)) {
return status;
Expand Down Expand Up @@ -696,7 +699,7 @@ pyinit_config(_PyRuntimeState *runtime,
config = &tstate->interp->config;
*tstate_p = tstate;

status = pycore_init_types(tstate, 1);
status = pycore_init_types(tstate);
if (_PyStatus_EXCEPTION(status)) {
return status;
}
Expand Down Expand Up @@ -1179,6 +1182,9 @@ finalize_interp_types(PyThreadState *tstate, int is_main_interp)
_PySet_Fini();
_PyBytes_Fini();
_PyLong_Fini();
}

if (is_main_interp) {
_PyFloat_Fini();
_PyDict_Fini();
_PySlice_Fini();
Expand All @@ -1200,8 +1206,10 @@ finalize_interp_types(PyThreadState *tstate, int is_main_interp)


static void
finalize_interp_clear(PyThreadState *tstate, int is_main_interp)
finalize_interp_clear(PyThreadState *tstate)
{
int is_main_interp = _Py_IsMainInterpreter(tstate);

/* Clear interpreter state and all thread states */
PyInterpreterState_Clear(tstate->interp);

Expand All @@ -1224,9 +1232,9 @@ finalize_interp_clear(PyThreadState *tstate, int is_main_interp)


static void
finalize_interp_delete(PyThreadState *tstate, int is_main_interp)
finalize_interp_delete(PyThreadState *tstate)
{
if (is_main_interp) {
if (_Py_IsMainInterpreter(tstate)) {
/* Cleanup auto-thread-state */
_PyGILState_Fini(tstate);
}
Expand Down Expand Up @@ -1388,9 +1396,8 @@ Py_FinalizeEx(void)
}
#endif /* Py_TRACE_REFS */

finalize_interp_clear(tstate, 1);

finalize_interp_delete(tstate, 1);
finalize_interp_clear(tstate);
finalize_interp_delete(tstate);

#ifdef Py_TRACE_REFS
/* Display addresses (& refcnts) of all objects still alive.
Expand Down Expand Up @@ -1482,7 +1489,7 @@ new_interpreter(PyThreadState **tstate_p)
}
config = &interp->config;

status = pycore_init_types(tstate, 0);
status = pycore_init_types(tstate);

/* XXX The following is lax in error checking */
PyObject *modules = PyDict_New();
Expand Down Expand Up @@ -1634,8 +1641,8 @@ Py_EndInterpreter(PyThreadState *tstate)
}

_PyImport_Cleanup(tstate);
finalize_interp_clear(tstate, 0);
finalize_interp_delete(tstate, 0);
finalize_interp_clear(tstate);
finalize_interp_delete(tstate);
}

/* Add the __main__ module */
Expand Down