Skip to content

gh-84570: Add Timeouts to SendChannel.send() and RecvChannel.recv() #110567

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 11 commits into from
Oct 17, 2023
Merged

gh-84570: Add Timeouts to SendChannel.send() and RecvChannel.recv() #110567

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
51b80c7
Factor out PyThread_ParseTimeoutArg().
ericsnowcurrently Sep 18, 2023
4dcf027
Pass a timeout to wait_for_lock().
ericsnowcurrently Sep 18, 2023
21d85dd
Support a timeout arg.
ericsnowcurrently Sep 18, 2023
f6df5ea
Add a timeout arg to SendChannel.send().
ericsnowcurrently Sep 18, 2023
1b1f916
Add a timeout to RecvChannel.recv().
ericsnowcurrently Sep 18, 2023
9131e5d
Fix args.
ericsnowcurrently Oct 10, 2023
b1c2b90
Fix timeout in RecvChannel.recv().
ericsnowcurrently Oct 13, 2023
cdd8bfe
Add timeout tests.
ericsnowcurrently Oct 10, 2023
84dd5ac
Clear the item if timed out.
ericsnowcurrently Oct 10, 2023
7ebd50c
Move the tests.
ericsnowcurrently Oct 17, 2023
2191920
Hide a refleak.
ericsnowcurrently Oct 17, 2023
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
Support a timeout arg.
  • Loading branch information
@ericsnowcurrently
ericsnowcurrently committed Oct 17, 2023
commit 21d85dd7af6908b65e909a1c0afd371d8d1c4da8
33 changes: 20 additions & 13 deletions Modules/_xxinterpchannelsmodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2816,21 +2816,24 @@ receive end.");
static PyObject *
channel_send(PyObject *self, PyObject *args, PyObject *kwds)
{
// XXX Add a timeout arg.
static char *kwlist[] = {"cid", "obj", "blocking", NULL};
int64_t cid;
static char *kwlist[] = {"cid", "obj", "blocking", "timeout", NULL};
struct channel_id_converter_data cid_data = {
.module = self,
};
PyObject *obj;
int blocking = 1;
if (!PyArg_ParseTupleAndKeywords(args, kwds, "O&O|$p:channel_send", kwlist,
PyObject *timeout_obj = NULL;
if (!PyArg_ParseTupleAndKeywords(args, kwds, "O&O|$pO:channel_send", kwlist,
channel_id_converter, &cid_data, &obj,
&blocking)) {
&blocking, &timeout_obj)) {
return NULL;
}

int64_t cid = cid_data.cid;
PY_TIMEOUT_T timeout;
if (PyThread_ParseTimeoutArg(timeout_obj, blocking, &timeout) < 0) {
return NULL;
}
cid = cid_data.cid;
PY_TIMEOUT_T timeout = PyThread_UNSET_TIMEOUT;

/* Queue up the object. */
int err = 0;
Expand All @@ -2856,21 +2859,25 @@ By default this waits for the object to be received.");
static PyObject *
channel_send_buffer(PyObject *self, PyObject *args, PyObject *kwds)
{
static char *kwlist[] = {"cid", "obj", "blocking", NULL};
int64_t cid;
static char *kwlist[] = {"cid", "obj", "blocking", "timeout", NULL};
struct channel_id_converter_data cid_data = {
.module = self,
};
PyObject *obj;
int blocking = 1;
PyObject *timeout_obj = NULL;
if (!PyArg_ParseTupleAndKeywords(args, kwds,
"O&O|$p:channel_send_buffer", kwlist,
"O&O|$pO:channel_send_buffer", kwlist,
channel_id_converter, &cid_data, &obj,
&blocking)) {
&blocking, &timeout_obj)) {
return NULL;
}

int64_t cid = cid_data.cid;
PY_TIMEOUT_T timeout;
if (PyThread_ParseTimeoutArg(timeout_obj, blocking, &timeout) < 0) {
return NULL;
}
cid = cid_data.cid;
PY_TIMEOUT_T timeout = PyThread_UNSET_TIMEOUT;

PyObject *tempobj = PyMemoryView_FromObject(obj);
if (tempobj == NULL) {
Expand Down