Skip to content

gh-76785: Expand How Interpreter Channels Handle Interpreter Finalization #121805

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
Jul 15, 2024
Merged

gh-76785: Expand How Interpreter Channels Handle Interpreter Finalization #121805

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4b3a595
Factor out interpreters._crossinterp.
ericsnowcurrently Jul 12, 2024
2835ec7
Improve unbound item support for channels.
ericsnowcurrently Jul 12, 2024
c6b3a0e
Make UNBOUND_REPLACE the default.
ericsnowcurrently Jul 12, 2024
f7125ab
Add _interpchannels.get_count().
ericsnowcurrently Jul 12, 2024
51c6f5d
Implement all the unbound logic.
ericsnowcurrently Jul 15, 2024
7fe548d
Drop some outdated TODO comments.
ericsnowcurrently Jul 15, 2024
971011b
Fix WASI.
ericsnowcurrently Jul 15, 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
Add _interpchannels.get_count().
  • Loading branch information
@ericsnowcurrently
ericsnowcurrently committed Jul 15, 2024
commit f7125abec93590ad13baff493165bfecc746a6ae
47 changes: 47 additions & 0 deletions Modules/_interpchannelsmodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1917,6 +1917,23 @@ channel_is_associated(_channels *channels, int64_t cid, int64_t interpid,
return (end != NULL && end->open);
}

static int
_channel_get_count(_channels *channels, int64_t cid, Py_ssize_t *p_count)
{
PyThread_type_lock mutex = NULL;
_channel_state *chan = NULL;
int err = _channels_lookup(channels, cid, &mutex, &chan);
if (err != 0) {
return err;
}
assert(chan != NULL);
int64_t count = chan->queue->count;
PyThread_release_lock(mutex);

*p_count = (Py_ssize_t)count;
return 0;
}


/* channel info */

Expand Down Expand Up @@ -3215,6 +3232,34 @@ Close the channel for the current interpreter. 'send' and 'recv'\n\
(bool) may be used to indicate the ends to close. By default both\n\
ends are closed. Closing an already closed end is a noop.");

static PyObject *
channelsmod_get_count(PyObject *self, PyObject *args, PyObject *kwds)
{
static char *kwlist[] = {"cid", NULL};
struct channel_id_converter_data cid_data = {
.module = self,
};
if (!PyArg_ParseTupleAndKeywords(args, kwds,
"O&:get_count", kwlist,
channel_id_converter, &cid_data)) {
return NULL;
}
int64_t cid = cid_data.cid;

Py_ssize_t count = -1;
int err = _channel_get_count(&_globals.channels, cid, &count);
if (handle_channel_error(err, self, cid)) {
return NULL;
}
assert(count >= 0);
return PyLong_FromSsize_t(count);
}

PyDoc_STRVAR(channelsmod_get_count_doc,
"get_count(cid)\n\
\n\
Return the number of items in the channel.");

static PyObject *
channelsmod_get_info(PyObject *self, PyObject *args, PyObject *kwds)
{
Expand Down Expand Up @@ -3341,6 +3386,8 @@ static PyMethodDef module_functions[] = {
METH_VARARGS | METH_KEYWORDS, channelsmod_close_doc},
{"release", _PyCFunction_CAST(channelsmod_release),
METH_VARARGS | METH_KEYWORDS, channelsmod_release_doc},
{"get_count", _PyCFunction_CAST(channelsmod_get_count),
METH_VARARGS | METH_KEYWORDS, channelsmod_get_count_doc},
{"get_info", _PyCFunction_CAST(channelsmod_get_info),
METH_VARARGS | METH_KEYWORDS, channelsmod_get_info_doc},
{"get_channel_defaults", _PyCFunction_CAST(channelsmod_get_channel_defaults),
Expand Down