Skip to content

gh-76785: Improved Subinterpreters Compatibility with 3.12 (1/2) #126704

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 8 commits into from
Nov 11, 2024
Merged

gh-76785: Improved Subinterpreters Compatibility with 3.12 (1/2) #126704

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
4c09639
Fix parking lot.
ericsnowcurrently Nov 5, 2024
6972d0b
xid_newobjectfunc -> xid_newobjfunc
ericsnowcurrently Nov 5, 2024
e4c64ad
_xid -> _xidata
ericsnowcurrently Nov 5, 2024
8ff613c
struct _xidregitem -> _PyXIData_regitem_t
ericsnowcurrently Nov 5, 2024
bca218a
struct _xidregistry -> _PyXIData_registry_t
ericsnowcurrently Nov 5, 2024
0239667
struct _xi_runtime_state -> _PyXI_global_state_t
ericsnowcurrently Nov 5, 2024
8f29d80
struct _xi_state -> _PyXI_state_t
ericsnowcurrently Nov 5, 2024
de75cb4
Use struct _xi_state to look up PyExc_NotShareableError.
ericsnowcurrently Nov 5, 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
xid_newobjectfunc -> xid_newobjfunc
  • Loading branch information
@ericsnowcurrently
ericsnowcurrently committed Nov 11, 2024
commit 6972d0b6af9dbd4ee5d56fdf51d88ce14995fb07
8 changes: 4 additions & 4 deletions Include/internal/pycore_crossinterp.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ extern int _Py_CallInInterpreterAndRawFree(
/**************************/

typedef struct _xid _PyXIData_t;
typedef PyObject *(*xid_newobjectfunc)(_PyXIData_t *);
typedef PyObject *(*xid_newobjfunc)(_PyXIData_t *);
typedef void (*xid_freefunc)(void *);

// _PyXIData_t is similar to Py_buffer as an effectively
Expand Down Expand Up @@ -72,7 +72,7 @@ struct _xid {
// interpreter given the data. The resulting object (a new
// reference) will be equivalent to the original object. This field
// is required.
xid_newobjectfunc new_object;
xid_newobjfunc new_object;
// free is called when the data is released. If it is NULL then
// nothing will be done to free the data. For some types this is
// okay (e.g. bytes) and for those types this field should be set
Expand Down Expand Up @@ -117,11 +117,11 @@ PyAPI_FUNC(int) _PyXIData_ReleaseAndRawFree(_PyXIData_t *);
PyAPI_FUNC(void) _PyXIData_Init(
_PyXIData_t *data,
PyInterpreterState *interp, void *shared, PyObject *obj,
xid_newobjectfunc new_object);
xid_newobjfunc new_object);
PyAPI_FUNC(int) _PyXIData_InitWithSize(
_PyXIData_t *,
PyInterpreterState *interp, const size_t, PyObject *,
xid_newobjectfunc);
xid_newobjfunc);
PyAPI_FUNC(void) _PyXIData_Clear( PyInterpreterState *, _PyXIData_t *);

// Normally the Init* functions are sufficient. The only time
Expand Down
2 changes: 1 addition & 1 deletion Modules/_interpchannelsmodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ _globals (static struct globals):
data (void *)
obj (PyObject *)
interpid (int64_t)
new_object (xid_newobjectfunc)
new_object (xid_newobjfunc)
free (xid_freefunc)
last (struct _channelitem *):
...
Expand Down
4 changes: 2 additions & 2 deletions Python/crossinterp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ void
_PyXIData_Init(_PyXIData_t *data,
PyInterpreterState *interp,
void *shared, PyObject *obj,
xid_newobjectfunc new_object)
xid_newobjfunc new_object)
{
assert(data != NULL);
assert(new_object != NULL);
Expand All @@ -150,7 +150,7 @@ int
_PyXIData_InitWithSize(_PyXIData_t *data,
PyInterpreterState *interp,
const size_t size, PyObject *obj,
xid_newobjectfunc new_object)
xid_newobjfunc new_object)
{
assert(size > 0);
// For now we always free the shared data in the same interpreter
Expand Down