8000 gh-109860: Use a New Thread State When Switching Interpreters, When Necessary by ericsnowcurrently · Pull Request #110245 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content

gh-109860: Use a New Thread State When Switching Interpreters, When Necessary #110245

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
merged 13 commits into from
Oct 3, 2023
Merged

gh-109860: Use a New Thread State When Switching Interpreters, When Necessary #110245

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
2117772
Add PyThreadState._whence.
ericsnowcurrently Sep 25, 2023
23828a3
Add an assert.
ericsnowcurrently Sep 25, 2023
b807906
Set up interp->_initial_thread for re-use.
ericsnowcurrently Sep 25, 2023
3e10a5c
Use a local PyThreadState in _PyInterpreterState_IDDecref().
ericsnowcurrently Sep 25, 2023
15e978a
Use a local PyThreadState in _xxsubinterpreters.
ericsnowcurrently Sep 26, 2023
0b60d6d
Throw away the initial thread state.
ericsnowcurrently Sep 26, 2023
781cb53
Use existing API.
ericsnowcurrently Sep 27, 2023
cd288b5
Release threading._main_thread._tstate_lock in _PyInterpreterState_Se…
ericsnowcurrently Sep 27, 2023
4afdf7b
Drop an assert (fork is messy).
ericsnowcurrently Sep 27, 2023
aba79e3
Add _PyInterpreterState_FailIfRunningMain().
ericsnowcurrently Sep 27, 2023
2c18554
Propagate "alraedy running" properly.
ericsnowcurrently Sep 27, 2023
845c2bd
Fix handling of no-memory in _sharedexception_bind().
ericsnowcurrently Sep 27, 2023
fec49b2
Fix some typos.
ericsnowcurrently Oct 2, 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
Propagate "alraedy running" properly.
  • Loading branch information
@ericsnowcurrently
ericsnowcurrently committed Oct 2, 2023
commit 2c185543540c3e20dac5fc540d2eaca900bb0554
57 changes: 43 additions & 14 deletions Modules/_xxsubinterpretersmodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,6 +242,10 @@ _sharedns_apply(_sharedns *shared, PyObject *ns)
// of the exception in the calling interpreter.

typedef struct _sharedexception {
PyInterpreterState *interp;
#define ERR_NOT_SET 0
#define ERR_ALREADY_RUNNING 1
int code;
const char *name;
const char *msg;
} _sharedexception;
Expand All @@ -263,8 +267,19 @@ _sharedexception_clear(_sharedexception *exc)
}

static const char *
_sharedexception_bind(PyObject *exc, _sharedexception *sharedexc)
_sharedexception_bind(PyObject *exc, int code, _sharedexception *sharedexc)
{
if (sharedexc->interp == NULL) {
sharedexc->interp = PyInterpreterState_Get();
}

if (code != ERR_NOT_SET) {
assert(exc == NULL);
assert(code > 0);
sharedexc->code = code;
return NULL;
}

assert(exc != NULL);
const char *failure = NULL;

Expand Down Expand Up @@ -301,6 +316,7 @@ _sharedexception_bind(PyObject *exc, _sharedexception *sharedexc)
goto error;
}
}
PyErr_NoMemory();

return NULL;

Expand All @@ -316,6 +332,7 @@ static void
_sharedexception_apply(_sharedexception *exc, PyObject *wrapperclass)
{
if (exc->name != NULL) {
assert(exc->code == ERR_NOT_SET);
if (exc->msg != NULL) {
PyErr_Format(wrapperclass, "%s: %s", exc->name, exc->msg);
}
Expand All @@ -324,9 +341,16 @@ _sharedexception_apply(_sharedexception *exc, PyObject *wrapperclass)
}
}
else if (exc->msg != NULL) {
assert(exc->code == ERR_NOT_SET);
PyErr_SetString(wrapperclass, exc->msg);
}
else if (exc->code == ERR_ALREADY_RUNNING) {
assert(exc->interp != NULL);
assert(_PyInterpreterState_IsRunningMain(exc->interp));
_PyInterpreterState_FailIfRunningMain(exc->interp);
}
else {
assert(exc->code == ERR_NOT_SET);
PyErr_SetNone(wrapperclass);
}
}
Expand Down Expand Up @@ -362,9 +386,16 @@ static int
_run_script(PyInterpreterState *interp, const char *codestr,
_sharedns *shared, _sharedexception *sharedexc)
{
int errcode = ERR_NOT_SET;

if (_PyInterpreterState_SetRunningMain(interp) < 0) {
// We skip going through the shared exception.
return -1;
assert(PyErr_Occurred());
// In the case where we didn't switch interpreters, it would
// be more efficient to leave the exception in place and return
// immediately. However, life is simpler if we don't.
PyErr_Clear();
errcode = ERR_ALREADY_RUNNING;
goto error;
}

PyObject *excval = NULL;
Expand Down Expand Up @@ -403,7 +434,7 @@ _run_script(PyInterpreterState *interp, const char *codestr,

error:
excval = PyErr_GetRaisedException();
const char *failure = _sharedexception_bind(excval, sharedexc);
const char *failure = _sharedexception_bind(excval, errcode, sharedexc);
if (failure != NULL) {
fprintf(stderr,
"RunFailedError: script raised an uncaught exception (%s)",
Expand All @@ -412,7 +443,9 @@ _run_script(PyInterpreterState *interp, const char *codestr,
}
Py_XDECREF(excval);
assert(!PyErr_Occurred());
_PyInterpreterState_SetNotRunningMain(interp);
if (errcode != ERR_ALREADY_RUNNING) {
_PyInterpreterState_SetNotRunningMain(interp);
}
return -1;
}

Expand All @@ -421,6 +454,7 @@ _run_script_in_interpreter(PyObject *mod, PyInterpreterState *interp,
const char *codestr, PyObject *shareables)
{
module_state *state = get_module_state(mod);
assert(state != NULL);

_sharedns *shared = _get_shared_ns(shareables);
if (shared == NULL && PyErr_Occurred()) {
Expand All @@ -438,7 +472,7 @@ _run_script_in_interpreter(PyObject *mod, PyInterpreterState *interp,
}

// Run the script.
_sharedexception exc = {NULL, NULL};
_sharedexception exc = (_sharedexception){ .interp = interp };
int result = _run_script(interp, codestr, shared, &exc);

// Switch back.
Expand All @@ -449,15 +483,10 @@ _run_script_in_interpreter(PyObject *mod, PyInterpreterState *interp,
}

// Propagate any exception out to the caller.
if (exc.name != NULL) {
assert(state != NULL);
if (result < 0) {
assert(!PyErr_Occurred());
_sharedexception_apply(&exc, state->RunFailedError);
}
else if (result != 0) {
if (!PyErr_Occurred()) {
// We were unable to allocate a shared exception.
PyErr_NoMemory();
}
assert(PyErr_Occurred());
}

if (shared != NULL) {
Expand Down
0