diff --git a/Lib/test/test__interpreters.py b/Lib/test/test__interpreters.py index 1b66f9c7646eb72..eeb4dbd6ce609aa 100644 --- a/Lib/test/test__interpreters.py +++ b/Lib/test/test__interpreters.py @@ -466,6 +466,39 @@ def test_still_running(self): _interpreters.destroy(interp) self.assertTrue(_interpreters.is_running(interp)) + def test_concurrent_run_and_destroy(self): + # gh-127041: An interpreter could start running during destroy(). + for _ in range(50): + interp = _interpreters.create() + barrier = threading.Barrier(2) + + def runner(): + barrier.wait() + try: + _interpreters.run_string(interp, "x = 1") + except _interpreters.InterpreterError: + pass + + def destroyer(): + barrier.wait() + try: + _interpreters.destroy(interp) + except _interpreters.InterpreterError: + pass + + threads = [ + threading.Thread(target=runner), + threading.Thread(target=destroyer), + ] + for t in threads: + t.start() + for t in threads: + t.join() + try: + _interpreters.destroy(interp) + except _interpreters.InterpreterError: + pass + class CommonTests(TestBase): def setUp(self): diff --git a/Python/crossinterp.c b/Python/crossinterp.c index b8dd5f11c2a44c7..c2a40f17ccf3389 100644 --- a/Python/crossinterp.c +++ b/Python/crossinterp.c @@ -11,6 +11,7 @@ #include "pycore_import.h" // _PyImport_SetModule() #include "pycore_initconfig.h" // _PyStatus_OK() #include "pycore_namespace.h" // _PyNamespace_New() +#include "pycore_pystate.h" // _PyInterpreterGuard_TryAcquire() #include "pycore_pythonrun.h" // _Py_SourceAsString() #include "pycore_runtime.h" // _PyRuntime #include "pycore_setobject.h" // _PySet_NextEntry() @@ -2546,6 +2547,10 @@ struct xi_session { // once the session exits. Do not access this directly; use // _PyXI_Preserve() and _PyXI_GetPreserved() instead; PyObject *_preserved; + + // PEP 788 finalization guard to prevent the interpreter from being + // destroyed/finalized while this session is active. + PyInterpreterGuard guard; }; _PyXI_session * @@ -2606,6 +2611,7 @@ _enter_session(_PyXI_session *session, PyInterpreterState *interp) .init_tstate = tstate, .prev_tstate = prev, .own_init_tstate = !same_interp, + .guard = session->guard, }; } @@ -2641,6 +2647,12 @@ _exit_session(_PyXI_session *session) assert(!session->own_init_tstate); } + // Release PEP 788 finalization guard after thread state cleanup & swap back. + if (session->guard.interp != NULL) { + _PyInterpreterGuard_Release(&session->guard); + session->guard.interp = NULL; + } + *session = (_PyXI_session){0}; } @@ -2714,6 +2726,16 @@ _PyXI_Enter(_PyXI_session *session, } } + // Acquire PEP 788 finalization guard before switching or running. + // If finalization has already started, TryAcquire will fail safely. + if (_PyInterpreterGuard_TryAcquire(interp, &session->guard) < 0) { + if (sharedns != NULL) { + _destroy_sharedns(sharedns); + } + PyErr_SetString(PyExc_InterpreterError, "interpreter is being destroyed"); + return -1; + } + // Switch to the requested interpreter (if necessary). _enter_session(session, interp); _PyXI_failure override = XI_FAILURE_INIT;