Thanks to visit codestin.com
Credit goes to github.com

Skip to content

gh-76785: Simplify Channels XID Types #116318

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

gh-76785: Simplify Channels XID Types #116318

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6cb18f4
add_new_type() -> add_channelid_type()
ericsnowcurrently Feb 15, 2024
f5d0db8
Add clear_xid_types().
ericsnowcurrently Feb 15, 2024
a3ef45a
Do not use the XID type registry in set_channelend_types().
ericsnowcurrently Feb 15, 2024
db9d92c
Drop the XID type registry.
ericsnowcurrently Feb 15, 2024
1acc34f
Merge branch 'main' into simplify-channels-xid-types
ericsnowcurrently Mar 4, 2024
970d88b
Clear the right class.
ericsnowcurrently Mar 4, 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
Do not use the XID type registry in set_channelend_types().
  • Loading branch information
@ericsnowcurrently
ericsnowcurrently committed Mar 4, 2024
commit a3ef45a6d107670d8acc58075f3268e8ebc5a8ae
28 changes: 19 additions & 9 deletions Modules/_xxinterpchannelsmodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,16 +313,23 @@ traverse_module_state(module_state *state, visitproc visit, void *arg)
static void
clear_xid_types(module_state *state)
{
clear_xid_class_registry(&state->xid_classes);

/* external types */
if (state->send_channel_type != NULL) {
(void)_PyCrossInterpreterData_UnregisterClass(state->send_channel_type);
Py_CLEAR(state->send_channel_type);
}
if (state->recv_channel_type != NULL) {
(void)_PyCrossInterpreterData_UnregisterClass(state->recv_channel_type);
Py_CLEAR(state->recv_channel_type);
}

/* heap types */
if (state->ChannelInfoType != NULL) {
(void)_PyCrossInterpreterData_UnregisterClass(state->ChannelInfoType);
Py_CLEAR(state->ChannelInfoType);
}

/* external types */
clear_xid_class_registry(&state->xid_classes);
Py_CLEAR(state->send_channel_type);
Py_CLEAR(state->recv_channel_type);
}

static int
Expand Down Expand Up @@ -2703,7 +2710,6 @@ set_channelend_types(PyObject *mod, PyTypeObject *send, PyTypeObject *recv)
if (state == NULL) {
return -1;
}
struct xid_class_registry *xid_classes = &state->xid_classes;

if (state->send_channel_type != NULL
|| state->recv_channel_type != NULL)
Expand All @@ -2713,11 +2719,15 @@ set_channelend_types(PyObject *mod, PyTypeObject *send, PyTypeObject *recv)
}
state->send_channel_type = (PyTypeObject *)Py_NewRef(send);
state->recv_channel_type = (PyTypeObject *)Py_NewRef(recv);

if (register_xid_class(send, _channelend_shared, xid_classes)) {
if (ensure_xid_class(send, _channelend_shared) < 0) {
Py_CLEAR(state->send_channel_type);
Py_CLEAR(state->recv_channel_type);
return -1;
}
if (register_xid_class(recv, _channelend_shared, xid_classes)) {
if (ensure_xid_class(recv, _channelend_shared) < 0) {
(void)_PyCrossInterpreterData_UnregisterClass(state->send_channel_type);
Py_CLEAR(state->send_channel_type);
Py_CLEAR(state->recv_channel_type);
return -1;
}

Expand Down