Skip to content

gh-76785: Drop PyInterpreterID_Type #117101

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 7 commits into from
Mar 21, 2024
Merged

gh-76785: Drop PyInterpreterID_Type #117101

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2370c16
Do not use PyInterpreterState_GetIDObject() in _xxinterpchannels module.
ericsnowcurrently Mar 20, 2024
cd66545
Update the tests
ericsnowcurrently Mar 20, 2024
22d5ae2
Drop PyInterpreterID_Type.
ericsnowcurrently Mar 20, 2024
c377fde
Drop a commented-out line.
ericsnowcurrently Mar 21, 2024
d8743be
Drop dead code.
ericsnowcurrently Mar 21, 2024
ce0b0cb
Add an extra test.
ericsnowcurrently Mar 21, 2024
49793f2
Change nearly all the subtests into separate tests.
ericsnowcurrently Mar 21, 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
Next Next commit
Do not use PyInterpreterState_GetIDObject() in _xxinterpchannels module.
  • Loading branch information
@ericsnowcurrently
ericsnowcurrently committed Mar 21, 2024
commit 2370c160178f51b753466cfe82038156d8d364b6
17 changes: 17 additions & 0 deletions Modules/_interpreters_common.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,20 @@ clear_xid_class(PyTypeObject *cls)
return _PyCrossInterpreterData_UnregisterClass(cls);
}
#endif


#ifdef RETURNS_INTERPID_OBJECT
static PyObject *
get_interpid_obj(PyInterpreterState *interp)
{
if (_PyInterpreterState_IDInitref(interp) != 0) {
return NULL;
};
int64_t id = PyInterpreterState_GetID(interp);
if (id < 0) {
return NULL;
}
assert(id < LLONG_MAX);
return PyLong_FromLongLong(id);
}
#endif
5 changes: 3 additions & 2 deletions Modules/_xxinterpchannelsmodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
#endif

#include "Python.h"
#include "interpreteridobject.h"
#include "pycore_crossinterp.h" // struct _xid
#include "pycore_interp.h" // _PyInterpreterState_LookUpID()

Expand All @@ -18,7 +17,9 @@
#endif

#define REGISTERS_HEAP_TYPES
#define RETURNS_INTERPID_OBJECT
#include "_interpreters_common.h"
#undef RETURNS_INTERPID_OBJECT
#undef REGISTERS_HEAP_TYPES


Expand Down Expand Up @@ -2908,7 +2909,7 @@ channelsmod_list_interpreters(PyObject *self, PyObject *args, PyObject *kwds)
goto except;
}
if (res) {
interpid_obj = PyInterpreterState_GetIDObject(interp);
interpid_obj = get_interpid_obj(interp);
if (interpid_obj == NULL) {
goto except;
}
Expand Down
17 changes: 2 additions & 15 deletions Modules/_xxsubinterpretersmodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,11 @@
#include "pycore_pyerrors.h" // _Py_excinfo
#include "pycore_pystate.h" // _PyInterpreterState_SetRunningMain()

#include "interpreteridobject.h"
#include "marshal.h" // PyMarshal_ReadObjectFromString()

#define RETURNS_INTERPID_OBJECT
#include "_interpreters_common.h"
#undef RETURNS_INTERPID_OBJECT


#define MODULE_NAME _xxsubinterpreters
Expand All @@ -38,20 +39,6 @@ _get_current_interp(void)
#define look_up_interp _PyInterpreterState_LookUpIDObject


static PyObject *
get_interpid_obj(PyInterpreterState *interp)
{
if (_PyInterpreterState_IDInitref(interp) != 0) {
return NULL;
};
int64_t id = PyInterpreterState_GetID(interp);
if (id < 0) {
return NULL;
}
assert(id < LLONG_MAX);
return PyLong_FromLongLong(id);
}

static PyObject *
_get_current_module(void)
{
Expand Down