Skip to content

gh-76785: Improved Subinterpreters Compatibility with 3.12 #115424

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 20 commits into from
Feb 13, 2024
Merged

gh-76785: Improved Subinterpreters Compatibility with 3.12 #115424

Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
ba23dd7
Add accessor macros for cross-interpreter data.
ericsnowcurrently Dec 19, 2023
db3f7de
Hide newer PyCodeObject fields behind macros.
ericsnowcurrently Dec 19, 2023
ee80f64
Add _PyThreadState_SetWhence().
ericsnowcurrently Dec 19, 2023
ef8dea0
Fix crossinterp.c.
ericsnowcurrently Jan 4, 2024
71a6a9a
Use PyInterpreterState_GetID().
ericsnowcurrently Jan 5, 2024
00b80ff
Add _PyRuntimeState_GetXIState() and _PyInterpreterState_GetXIState().
ericsnowcurrently Jan 5, 2024
e5fcc75
Factor out _interpreters_common.h.
ericsnowcurrently Jan 5, 2024
f50017e
Factor out crossinterp_data_lookup.h.
ericsnowcurrently Jan 5, 2024
7bd8f7f
Use PyInterpreterState_Get().
ericsnowcurrently Jan 5, 2024
f68737b
Add _Py_EMPTY_STR.
ericsnowcurrently Jan 5, 2024
c99fd01
Use PyErr_SetString().
ericsnowcurrently Jan 5, 2024
e2f9cf0
Use MODULE_NAME for the module init func name.
ericsnowcurrently Jan 6, 2024
dedc0e8
Factor out crossinterp_exceptionsw.h.
ericsnowcurrently Jan 8, 2024
64605ed
Fix exception docstrings.
ericsnowcurrently Jan 8, 2024
5c008de
Move NotShareableError to crossinterp_exceptions.h.
ericsnowcurrently Jan 8, 2024
f17b29b
Work around a ref leak.
ericsnowcurrently Jan 9, 2024
18ede77
Fix build dependencies.
ericsnowcurrently Jan 10, 2024
842a990
Fix the Exception names.
ericsnowcurrently Jan 22, 2024
8448f9d
Use PyInterpreterState_GetID().
ericsnowcurrently Jan 22, 2024
455460c
Update the C analyzer.
ericsnowcurrently Feb 13, 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
Prev Previous commit
Next Next commit
Fix crossinterp.c.
  • Loading branch information
@ericsnowcurrently
ericsnowcurrently committed Feb 13, 2024
commit ef8dea06eb92dc9249381c24bf07fa1f00785e2c
25 changes: 14 additions & 11 deletions Python/crossinterp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ _xidata_init(_PyCrossInterpreterData *data)
assert(data->data == NULL);
assert(data->obj == NULL);
*data = (_PyCrossInterpreterData){0};
data->interpid = -1;
_PyCrossInterpreterData_INTERPID(data) = -1;
}

static inline void
Expand Down Expand Up @@ -193,7 +193,9 @@ _PyCrossInterpreterData_Init(_PyCrossInterpreterData *data,
// Ideally every object would know its owning interpreter.
// Until then, we have to rely on the caller to identify it
// (but we don't need it in all cases).
data->interpid = (interp != NULL) ? interp->id : -1;
_PyCrossInterpreterData_INTERPID(data) = (interp != NULL)
? interp->id
: -1;
data->new_object = new_object;
}

Expand Down Expand Up @@ -223,8 +225,8 @@ _PyCrossInterpreterData_Clear(PyInterpreterState *interp,
assert(data != NULL);
// This must be called in the owning interpreter.
assert(interp == NULL
|| data->interpid == -1
|| data->interpid == interp->id);
|| _PyCrossInterpreterData_INTERPID(data) == -1
|| _PyCrossInterpreterData_INTERPID(data) == interp->id);
_xidata_clear(data);
}

Expand All @@ -238,7 +240,7 @@ _check_xidata(PyThreadState *tstate, _PyCrossInterpreterData *data)

// data->obj may be NULL, so we don't check it.

if (data->interpid < 0) {
if (_PyCrossInterpreterData_INTERPID(data) < 0) {
_PyErr_SetString(tstate, PyExc_SystemError, "missing interp");
return -1;
}
Expand Down Expand Up @@ -318,7 +320,7 @@ _PyObject_GetCrossInterpreterData(PyObject *obj, _PyCrossInterpreterData *data)

// Reset data before re-populating.
*data = (_PyCrossInterpreterData){0};
data->interpid = -1;
_PyCrossInterpreterData_INTERPID(data) = -1;

// Call the "getdata" func for the object.
Py_INCREF(obj);
Expand All @@ -337,7 +339,7 @@ _PyObject_GetCrossInterpreterData(PyObject *obj, _PyCrossInterpreterData *data)
}

// Fill in the blanks and validate the result.
data->interpid = interp->id;
_PyCrossInterpreterData_INTERPID(data) = interp->id;
if (_check_xidata(tstate, data) != 0) {
(void)_PyCrossInterpreterData_Release(data);
return -1;
Expand Down Expand Up @@ -374,7 +376,8 @@ _xidata_release(_PyCrossInterpreterData *data, int rawfree)
}

// Switch to the original interpreter.
PyInterpreterState *interp = _PyInterpreterState_LookUpID(data->interpid);
PyInterpreterState *interp = _PyInterpreterState_LookUpID(
_PyCrossInterpreterData_INTERPID(data));
if (interp == NULL) {
// The interpreter was already destroyed.
// This function shouldn't have been called.
Expand Down Expand Up @@ -811,7 +814,7 @@ _tuple_shared_free(void* data)
#endif
for (Py_ssize_t i = 0; i < shared->len; i++) {
if (shared->data[i] != NULL) {
assert(shared->data[i]->interpid == interpid);
assert(_PyCrossInterpreterData_INTERPID(shared->data[i]) == interpid);
_PyCrossInterpreterData_Release(shared->data[i]);
PyMem_RawFree(shared->data[i]);
shared->data[i] = NULL;
Expand Down Expand Up @@ -1600,7 +1603,7 @@ _sharednsitem_has_value(_PyXI_namespace_item *item, int64_t *p_interpid)
return 0;
}
if (p_interpid != NULL) {
*p_interpid = item->data->interpid;
*p_interpid = _PyCrossInterpreterData_INTERPID(item->data);
}
return 1;
}
Expand Down Expand Up @@ -2014,7 +2017,7 @@ _enter_session(_PyXI_session *session, PyInterpreterState *interp)
PyThreadState *prev = tstate;
if (interp != tstate->interp) {
tstate = PyThreadState_New(interp);
tstate->_whence = _PyThreadState_WHENCE_EXEC;
_PyThreadState_SetWhence(tstate, _PyThreadState_WHENCE_EXEC);
// XXX Possible GILState issues?
session->prev_tstate = PyThreadState_Swap(tstate);
assert(session->prev_tstate == prev);
Expand Down