Skip to content

bpo-32604: [_xxsubinterpreters] Add channel_send_wait(). #19829

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

Closed
ericsnowcurrently wants to merge 7 commits into from
Closed

bpo-32604: [_xxsubinterpreters] Add channel_send_wait(). #19829

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d379eb6
Add an arg converter for threading timeouts.
ericsnowcurrently May 1, 2020
7a80a29
Add _Py_DECREF_in_interpreter().
ericsnowcurrently May 1, 2020
a3c2678
Add a lock wrapper class.
ericsnowcurrently May 1, 2020
98433f5
Factor out _lockobj_free().
ericsnowcurrently May 1, 2020
b60ff28
Add _channelitem.recvlock.
ericsnowcurrently May 1, 2020
070f508
Pass recvlock through from _channel_send() to the channelitem.
ericsnowcurrently May 1, 2020
bdc8926
Add channel_send_wait().
ericsnowcurrently May 1, 2020
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
Pass recvlock through from _channel_send() to the channelitem.
  • Loading branch information
@ericsnowcurrently
ericsnowcurrently committed May 1, 2020
commit 070f508d4cb953f7c95580a0a103029fc8feca69
16 changes: 10 additions & 6 deletions Modules/_xxsubinterpretersmodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -593,13 +593,15 @@ _channelqueue_free(_channelqueue *queue)
}

static int
_channelqueue_put(_channelqueue *queue, _PyCrossInterpreterData *data)
_channelqueue_put(_channelqueue *queue, _PyCrossInterpreterData *data,
_lockobj *recvlock)
{
_channelitem *item = _channelitem_new();
if (item == NULL) {
return -1;
}
item->data = data;
item->recvlock = recvlock;

queue->count += 1;
if (queue->first == NULL) {
Expand Down Expand Up @@ -911,7 +913,7 @@ _channel_free(_PyChannelState *chan)

static int
_channel_add(_PyChannelState *chan, int64_t interp,
_PyCrossInterpreterData *data)
_PyCrossInterpreterData *data, _lockobj *recvlock)
{
int res = -1;
PyThread_acquire_lock(chan->mutex, WAIT_LOCK);
Expand All @@ -924,7 +926,7 @@ _channel_add(_PyChannelState *chan, int64_t interp,
goto done;
}

if (_channelqueue_put(chan->queue, data) != 0) {
if (_channelqueue_put(chan->queue, data, recvlock) != 0) {
goto done;
}

Expand Down Expand Up @@ -1430,7 +1432,8 @@ _channel_destroy(_channels *channels, int64_t id)
}

static int
_channel_send(_channels *channels, int64_t id, PyObject *obj)
_channel_send(_channels *channels, int64_t id, PyObject *obj,
_lockobj *recvlock)
{
PyInterpreterState *interp = _get_current();
if (interp == NULL) {
Expand Down Expand Up @@ -1464,7 +1467,8 @@ _channel_send(_channels *channels, int64_t id, PyObject *obj)
}

// Add the data to the channel.
int res = _channel_add(chan, PyInterpreterState_GetID(interp), data);
int res = _channel_add(chan, PyInterpreterState_GetID(interp), data,
recvlock);
PyThread_release_lock(mutex);
if (res != 0) {
_PyCrossInterpreterData_Release(data);
Expand Down Expand Up @@ -2562,7 +2566,7 @@ channel_send(PyObject *self, PyObject *args, PyObject *kwds)
return NULL;
}

if (_channel_send(&_globals.channels, cid, obj) != 0) {
if (_channel_send(&_globals.channels, cid, obj, NULL) != 0) {
return NULL;
}
Py_RETURN_NONE;
Expand Down