Skip to content

gh-76785: Minor Improvements to "interpreters" Module #116328

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

gh-76785: Minor Improvements to "interpreters" Module #116328

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
efd5f33
Make Interpreter instances pickleable.
ericsnowcurrently Mar 1, 2024
acd472a
Make interpreters.Queue instances pickleable.
ericsnowcurrently Mar 1, 2024
98a03d2
Make interpreters.*Channel instances pickleable.
ericsnowcurrently Mar 4, 2024
46c6fb5
Raise QueueNotFoundError from _interpqueues.release().
ericsnowcurrently Mar 1, 2024
7df489d
Combine the two QueueEmpty (and QueueFull) exception types.
ericsnowcurrently Mar 1, 2024
dddd40b
Fix docstrings in the low-level module.
ericsnowcurrently Mar 1, 2024
512bed1
get_default_fmt -> get_queue_defaults
ericsnowcurrently Mar 1, 2024
55e0e92
Drop the default arg from _interpqueues.get().
ericsnowcurrently Mar 1, 2024
b15e706
Add low-level tests.
ericsnowcurrently Mar 2, 2024
38fe300
_PyCrossInterpreterData_UnregisterClass -> clear_xid_class
ericsnowcurrently Mar 4, 2024
9496113
Destroy any remaining queues.
ericsnowcurrently Mar 4, 2024
5645bcf
Do not crash for an unbalanced queue release.
ericsnowcurrently Mar 4, 2024
c43da0c
Fix a compiler warning.
ericsnowcurrently Mar 5, 2024
50a84f4
Fix TestBase.tearDown().
ericsnowcurrently Mar 5, 2024
3bd92b7
Fix a compiler warning.
ericsnowcurrently Mar 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
_PyCrossInterpreterData_UnregisterClass -> clear_xid_class
  • Loading branch information
@ericsnowcurrently
ericsnowcurrently committed Mar 4, 2024
commit 38fe300665bf05d69309ffc1297e884b2a6d72d3
8 changes: 8 additions & 0 deletions Modules/_interpreters_common.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,11 @@ ensure_xid_class(PyTypeObject *cls, crossinterpdatafunc getdata)
//assert(cls->tp_flags & Py_TPFLAGS_HEAPTYPE);
return _PyCrossInterpreterData_RegisterClass(cls, getdata);
}

#ifdef REGISTERS_HEAP_TYPES
static int
clear_xid_class(PyTypeObject *cls)
{
return _PyCrossInterpreterData_UnregisterClass(cls);
}
#endif
14 changes: 8 additions & 6 deletions Modules/_xxinterpchannelsmodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@
#include <sched.h> // sched_yield()
#endif

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


/*
Expand Down Expand Up @@ -281,17 +283,17 @@ clear_xid_types(module_state *state)
{
/* external types */
if (state->send_channel_type != NULL) {
(void)_PyCrossInterpreterData_UnregisterClass(state->send_channel_type);
(void)clear_xid_class(state->send_channel_type);
Py_CLEAR(state->send_channel_type);
}
if (state->recv_channel_type != NULL) {
(void)_PyCrossInterpreterData_UnregisterClass(state->recv_channel_type);
(void)clear_xid_class(state->recv_channel_type);
Py_CLEAR(state->recv_channel_type);
}

/* heap types */
if (state->ChannelIDType != NULL) {
(void)_PyCrossInterpreterData_UnregisterClass(state->ChannelIDType);
(void)clear_xid_class(state->ChannelIDType);
Py_CLEAR(state->ChannelIDType);
}
}
Expand Down Expand Up @@ -2677,11 +2679,11 @@ set_channelend_types(PyObject *mod, PyTypeObject *send, PyTypeObject *recv)

// Clear the old values if the .py module was reloaded.
if (state->send_channel_type != NULL) {
(void)_PyCrossInterpreterData_UnregisterClass(state->send_channel_type);
(void)clear_xid_class(state->send_channel_type);
Py_CLEAR(state->send_channel_type);
}
if (state->recv_channel_type != NULL) {
(void)_PyCrossInterpreterData_UnregisterClass(state->recv_channel_type);
(void)clear_xid_class(state->recv_channel_type);
Py_CLEAR(state->recv_channel_type);
}

Expand All @@ -2694,7 +2696,7 @@ set_channelend_types(PyObject *mod, PyTypeObject *send, PyTypeObject *recv)
return -1;
}
if (ensure_xid_class(recv, _channelend_shared) < 0) {
(void)_PyCrossInterpreterData_UnregisterClass(state->send_channel_type);
(void)clear_xid_class(state->send_channel_type);
Py_CLEAR(state->send_channel_type);
Py_CLEAR(state->recv_channel_type);
return -1;
Expand Down
7 changes: 4 additions & 3 deletions Modules/_xxinterpqueuesmodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,9 @@
#include "Python.h"
#include "pycore_crossinterp.h" // struct _xid

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


#define MODULE_NAME _xxinterpqueues
Expand Down Expand Up @@ -186,7 +188,7 @@ clear_module_state(module_state *state)
{
/* external types */
if (state->queue_type != NULL) {
(void)_PyCrossInterpreterData_UnregisterClass(state->queue_type);
(void)clear_xid_class(state->queue_type);
}
Py_CLEAR(state->queue_type);

Expand Down Expand Up @@ -1146,8 +1148,7 @@ set_external_queue_type(module_state *state, PyTypeObject *queue_type)
{
// Clear the old value if the .py module was reloaded.
if (state->queue_type != NULL) {
(void)_PyCrossInterpreterData_UnregisterClass(
state->queue_type);
(void)clear_xid_class(state->queue_type);
Py_CLEAR(state->queue_type);
}

Expand Down