mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-09 16:34:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 17

gh-76785: Clean Up the Channels Module (gh-110568)

Browse source
This commit is contained in:
Eric Snow 2023-10-17 17:51:52 -06:00 • committed by GitHub
parent 73a003f646
commit a77fa05124
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 335 additions and 297 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Include/cpython/pystate.h
View file

@ -291,7 +291,7 @@ struct _xid {
// with deleted interpreters. Note that IDs are never re-used, so // with deleted interpreters. Note that IDs are never re-used, so
// each one will always correspond to a specific interpreter // each one will always correspond to a specific interpreter
// (whether still alive or not). // (whether still alive or not).
int64_t interp; int64_t interpid;
// new_object is a function that returns a new object in the current // new_object is a function that returns a new object in the current
// interpreter given the data. The resulting object (a new // interpreter given the data. The resulting object (a new
// reference) will be equivalent to the original object. This field // reference) will be equivalent to the original object. This field

616
Modules/_xxinterpchannelsmodule.c
View file

File diff suppressed because it is too large Load diff

14
Python/pystate.c
View file

@ -2428,7 +2428,7 @@ _xidata_init(_PyCrossInterpreterData *data)
assert(data->data == NULL); assert(data->data == NULL);
assert(data->obj == NULL); assert(data->obj == NULL);
*data = (_PyCrossInterpreterData){0}; *data = (_PyCrossInterpreterData){0};
data->interp = -1; data->interpid = -1;
} }
static inline void static inline void
@ -2465,7 +2465,7 @@ _PyCrossInterpreterData_Init(_PyCrossInterpreterData *data,
// Ideally every object would know its owning interpreter. // Ideally every object would know its owning interpreter.
// Until then, we have to rely on the caller to identify it // Until then, we have to rely on the caller to identify it
// (but we don't need it in all cases). // (but we don't need it in all cases).
data->interp = (interp != NULL) ? interp->id : -1; data->interpid = (interp != NULL) ? interp->id : -1;
data->new_object = new_object; data->new_object = new_object;
} }
@ -2494,7 +2494,7 @@ _PyCrossInterpreterData_Clear(PyInterpreterState *interp,
{ {
assert(data != NULL); assert(data != NULL);
// This must be called in the owning interpreter. // This must be called in the owning interpreter.
assert(interp == NULL || data->interp == interp->id); assert(interp == NULL || data->interpid == interp->id);
_xidata_clear(data); _xidata_clear(data);
} }
@ -2505,7 +2505,7 @@ _check_xidata(PyThreadState *tstate, _PyCrossInterpreterData *data)
// data->obj may be NULL, so we don't check it. // data->obj may be NULL, so we don't check it.
if (data->interp < 0) { if (data->interpid < 0) {
_PyErr_SetString(tstate, PyExc_SystemError, "missing interp"); _PyErr_SetString(tstate, PyExc_SystemError, "missing interp");
return -1; return -1;
} }
@ -2557,7 +2557,7 @@ _PyObject_GetCrossInterpreterData(PyObject *obj, _PyCrossInterpreterData *data)
// Reset data before re-populating. // Reset data before re-populating.
*data = (_PyCrossInterpreterData){0}; *data = (_PyCrossInterpreterData){0};
data->interp = -1; data->interpid = -1;
// Call the "getdata" func for the object. // Call the "getdata" func for the object.
Py_INCREF(obj); Py_INCREF(obj);
@ -2573,7 +2573,7 @@ _PyObject_GetCrossInterpreterData(PyObject *obj, _PyCrossInterpreterData *data)
} }
// Fill in the blanks and validate the result. // Fill in the blanks and validate the result.
data->interp = interp->id; data->interpid = interp->id;
if (_check_xidata(tstate, data) != 0) { if (_check_xidata(tstate, data) != 0) {
(void)_PyCrossInterpreterData_Release(data); (void)_PyCrossInterpreterData_Release(data);
return -1; return -1;
@ -2636,7 +2636,7 @@ _xidata_release(_PyCrossInterpreterData *data, int rawfree)
} }
// Switch to the original interpreter. // Switch to the original interpreter.
PyInterpreterState *interp = _PyInterpreterState_LookUpID(data->interp); PyInterpreterState *interp = _PyInterpreterState_LookUpID(data->interpid);
if (interp == NULL) { if (interp == NULL) {
// The interpreter was already destroyed. // The interpreter was already destroyed.
// This function shouldn't have been called. // This function shouldn't have been called.