Skip to content

gh-76785: Minor Cleanup of "Cross-interpreter" Code #126457

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

gh-76785: Minor Cleanup of "Cross-interpreter" Code #126457

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
f513a3c
_PyCrossInterpreterData -> _PyXIData_t
ericsnowcurrently Nov 5, 2024
873973a
crossinterpdatafunc -> xidatafunc
ericsnowcurrently Nov 5, 2024
9057584
CrossInterpreterData -> XIData
ericsnowcurrently Nov 5, 2024
759d399
Adjust declaration groups.
ericsnowcurrently Nov 5, 2024
ccf3edc
Move an include to the right file.
ericsnowcurrently Nov 5, 2024
81eacbf
Use the local typedefs.
ericsnowcurrently Nov 5, 2024
8c2586d
Split out pycore_crossinterp_data_registry.h.
ericsnowcurrently Nov 5, 2024
5eb7adb
Wrap _PyXIData_registry_t with a new _PyXIData_lookup_t.
ericsnowcurrently Nov 5, 2024
ab27394
Fix the c-analyzer.
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
Adjust declaration groups.
  • Loading branch information
@ericsnowcurrently
ericsnowcurrently committed Nov 5, 2024
commit 759d39905b34119e9b714b226db3d3fba5f06233
28 changes: 16 additions & 12 deletions Include/internal/pycore_crossinterp.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,22 @@ PyAPI_FUNC(void) _PyXIData_Free(_PyXIData_t *data);
// Users should not need getters for "new_object" or "free".


/* getting cross-interpreter data */

typedef int (*xidatafunc)(PyThreadState *tstate, PyObject *, _PyXIData_t *);

PyAPI_FUNC(xidatafunc) _PyXIData_Lookup(PyObject *);
PyAPI_FUNC(int) _PyObject_CheckXIData(PyObject *);
PyAPI_FUNC(int) _PyObject_GetXIData(PyObject *, _PyXIData_t *);


/* using cross-interpreter data */

PyAPI_FUNC(PyObject *) _PyXIData_NewObject(_PyXIData_t *);
PyAPI_FUNC(int) _PyXIData_Release(_PyXIData_t *);
PyAPI_FUNC(int) _PyXIData_ReleaseAndRawFree(_PyXIData_t *);


/* defining cross-interpreter data */

PyAPI_FUNC(void) _PyXIData_Init(
Expand Down Expand Up @@ -125,23 +141,12 @@ PyAPI_FUNC(void) _PyXIData_Clear( PyInterpreterState *, _PyXIData_t *);
} while (0)


/* using cross-interpreter data */

PyAPI_FUNC(int) _PyObject_CheckXIData(PyObject *);
PyAPI_FUNC(int) _PyObject_GetXIData(PyObject *, _PyXIData_t *);
PyAPI_FUNC(PyObject *) _PyXIData_NewObject(_PyXIData_t *);
PyAPI_FUNC(int) _PyXIData_Release(_PyXIData_t *);
PyAPI_FUNC(int) _PyXIData_ReleaseAndRawFree(_PyXIData_t *);


/* cross-interpreter data registry */

// For now we use a global registry of shareable classes. An
// alternative would be to add a tp_* slot for a class's
// xidatafunc. It would be simpler and more efficient.

typedef int (*xidatafunc)(PyThreadState *tstate, PyObject *, _PyXIData_t *);

struct _xidregitem;

struct _xidregitem {
Expand All @@ -164,7 +169,6 @@ struct _xidregistry {

PyAPI_FUNC(int) _PyXIData_RegisterClass(PyTypeObject *, xidatafunc);
PyAPI_FUNC(int) _PyXIData_UnregisterClass(PyTypeObject *);
PyAPI_FUNC(xidatafunc) _PyXIData_Lookup(PyObject *);


/*****************************/
Expand Down