8000 _PyChannelState -> _channel_state · python/cpython@b85ea26 · GitHub
[go: up one dir, main page]
Skip to content

Commit b85ea26

Browse files
ericsnowcurrentlyericsnowcurrently
committed
_PyChannelState -> _channel_state
1 parent bdb450e commit b85ea26

File tree

1 file changed

+29
-29
lines changed

1 file changed

+29
-29
lines changed

‎Modules/_xxinterpchannelsmodule.c

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1188,12 +1188,12 @@ typedef struct _channel {
11881188
_channelends *ends;
11891189
int open;
11901190
struct _channel_closing *closing;
1191-
} _PyChannelState;
1191+
} _channel_state;
11921192

1193-
static _PyChannelState *
1193+
static _channel_state *
11941194
_channel_new(PyThread_type_lock mutex)
11951195
{
1196-
_PyChannelState *chan = GLOBAL_MALLOC(_PyChannelState);
1196+
_channel_state *chan = GLOBAL_MALLOC(_channel_state);
11971197
if (chan == NULL) {
11981198
return NULL;
11991199
}
@@ -1215,7 +1215,7 @@ _channel_new(PyThread_type_lock mutex)
12151215
}
12161216

12171217
static void
1218-
_channel_free(_PyChannelState *chan)
1218+
_channel_free(_channel_state *chan)
12191219
{
12201220
_channel_clear_closing(chan);
12211221
PyThread_acquire_lock(chan->mutex, WAIT_LOCK);
@@ -1228,7 +1228,7 @@ _channel_free(_PyChannelState *chan)
12281228
}
12291229

12301230
static int
1231-
_channel_add(_PyChannelState *chan, int64_t interpid,
1231+
_channel_add(_channel_state *chan, int64_t interpid,
12321232
_PyCrossInterpreterData *data, _waiting_t *waiting)
12331233
{
12341234
int res = -1;
@@ -1255,7 +1255,7 @@ _channel_add(_PyChannelState *chan, int64_t interpid,
12551255
}
12561256

12571257
static int
1258-
_channel_next(_PyChannelState *chan, int64_t interpid,
1258+
_channel_next(_channel_state *chan, int64_t interpid,
12591259
_PyCrossInterpreterData **p_data, _waiting_t **p_waiting)
12601260
{
12611261
int err = 0;
@@ -1286,7 +1286,7 @@ _channel_next(_PyChannelState *chan, int64_t interpid,
12861286
}
12871287

12881288
static void
1289-
_channel_remove(_PyChannelState *chan, _channelitem_id_t itemid)
1289+
_channel_remove(_channel_state *chan, _channelitem_id_t itemid)
12901290
{
12911291
_PyCrossInterpreterData *data = NULL;
12921292
_waiting_t *waiting = NULL;
@@ -1306,7 +1306,7 @@ _channel_remove(_PyChannelState *chan, _channelitem_id_t itemid)
13061306
}
13071307

13081308
static int
1309-
_channel_release_interpreter(_PyChannelState *chan, int64_t interpid, int end)
1309+
_channel_release_interpreter(_channel_state *chan, int64_t interpid, int end)
13101310
{
13111311
PyThread_acquire_lock(chan->mutex, WAIT_LOCK);
13121312

@@ -1330,7 +1330,7 @@ _channel_release_interpreter(_PyChannelState *chan, int64_t interpid, int end)
13301330
}
13311331

13321332
static int
1333-
_channel_release_all(_PyChannelState *chan, int end, int force)
1333+
_channel_release_all(_channel_state *chan, int end, int force)
13341334
{
13351335
int res = -1;
13361336
PyThread_acquire_lock(chan->mutex, WAIT_LOCK);
@@ -1359,7 +1359,7 @@ _channel_release_all(_PyChannelState *chan, int end, int force)
13591359
}
13601360

13611361
static void
1362-
_channel_clear_interpreter(_PyChannelState *chan, int64_t interpid)
1362+
_channel_clear_interpreter(_channel_state *chan, int64_t interpid)
13631363
{
13641364
PyThread_acquire_lock(chan->mutex, WAIT_LOCK);
13651365

@@ -1377,14 +1377,14 @@ struct _channelref;
13771377

13781378
typedef struct _channelref {
13791379
int64_t cid;
1380-
_PyChannelState *chan;
1380+
_channel_state *chan;
13811381
struct _channelref *next;
13821382
// The number of ChannelID objects referring to this channel.
13831383
Py_ssize_t objcount;
13841384
} _channelref;
13851385

13861386
static _channelref *
1387-
_channelref_new(int64_t cid, _PyChannelState *chan)
1387+
_channelref_new(int64_t cid, _channel_state *chan)
13881388
{
13891389
_channelref *ref = GLOBAL_MALLOC(_channelref);
13901390
if (ref == NULL) {
@@ -1476,10 +1476,10 @@ _channels_next_id(_channels *channels) // needs lock
14761476

14771477
static int
14781478
_channels_lookup(_channels *channels, int64_t cid, PyThread_type_lock *pmutex,
1479-
_PyChannelState **res)
1479+
_channel_state **res)
14801480
{
14811481
int err = -1;
1482-
_PyChannelState *chan = NULL;
1482+
_channel_state *chan = NULL;
14831483
PyThread_acquire_lock(channels->mutex, WAIT_LOCK);
14841484
if (pmutex != NULL) {
14851485
*pmutex = NULL;
@@ -1512,7 +1512,7 @@ _channels_lookup(_channels *channels, int64_t cid, PyThread_type_lock *pmutex,
15121512
}
15131513

15141514
static int64_t
1515-
_channels_add(_channels *channels, _PyChannelState *chan)
1515+
_channels_add(_channels *channels, _channel_state *chan)
15161516
{
15171517
int64_t cid = -1;
15181518
PyThread_acquire_lock(channels->mutex, WAIT_LOCK);
@@ -1544,7 +1544,7 @@ _channels_add(_channels *channels, _PyChannelState *chan)
15441544
static int _channel_set_closing(_channelref *, PyThread_type_lock);
15451545

15461546
static int
1547-
_channels_close(_channels *channels, int64_t cid, _PyChannelState **pchan,
1547+
_channels_close(_channels *channels, int64_t cid, _channel_state **pchan,
15481548
int end, int force)
15491549
{
15501550
int res = -1;
@@ -1610,7 +1610,7 @@ _channels_close(_channels *channels, int64_t cid, _PyChannelState **pchan,
16101610

16111611
static void
16121612
_channels_remove_ref(_channels *channels, _channelref *ref, _channelref *prev,
1613-
_PyChannelState **pchan)
1613+
_channel_state **pchan)
16141614
{
16151615
if (ref == channels->head) {
16161616
channels->head = ref->next;
@@ -1627,7 +1627,7 @@ _channels_remove_ref(_channels *channels, _channelref *ref, _channelref *prev,
16271627
}
16281628

16291629
static int
1630-
_channels_remove(_channels *channels, int64_t cid, _PyChannelState **pchan)
1630+
_channels_remove(_channels *channels, int64_t cid, _channel_state **pchan)
16311631
{
16321632
int res = -1;
16331633
PyThread_acquire_lock(channels->mutex, WAIT_LOCK);
@@ -1685,7 +1685,7 @@ _channels_release_cid_object(_channels *channels, int64_t cid)
16851685

16861686
// Destroy if no longer used.
16871687
if (ref->objcount == 0) {
1688-
_PyChannelState *chan = NULL;
1688+
_channel_state *chan = NULL;
16891689
_channels_remove_ref(channels, ref, prev, &chan);
16901690
if (chan != NULL) {
16911691
_channel_free(chan);
@@ -1741,7 +1741,7 @@ struct _channel_closing {
17411741

17421742
static int
17431743
_channel_set_closing(_channelref *ref, PyThread_type_lock mutex) {
1744-
_PyChannelState *chan = ref->chan;
1744+
_channel_state *chan = ref->chan;
17451745
if (chan == NULL) {
17461746
// already closed
17471747
return 0;
@@ -1765,7 +1765,7 @@ _channel_set_closing(_channelref *ref, PyThread_type_lock mutex) {
17651765
}
17661766

17671767
static void
1768-
_channel_clear_closing(_PyChannelState *chan) {
1768+
_channel_clear_closing(_channel_state *chan) {
17691769
PyThread_acquire_lock(chan->mutex, WAIT_LOCK);
17701770
if (chan->closing != NULL) {
17711771
GLOBAL_FREE(chan->closing);
@@ -1775,7 +1775,7 @@ _channel_clear_closing(_PyChannelState *chan) {
17751775
}
17761776

17771777
static void
1778-
_channel_finish_closing(_PyChannelState *chan) {
1778+
_channel_finish_closing(_channel_state *chan) {
17791779
struct _channel_closing *closing = chan->closing;
17801780
if (closing == NULL) {
17811781
return;
@@ -1798,7 +1798,7 @@ channel_create(_channels *channels)
17981798
if (mutex == NULL) {
17991799
return ERR_CHANNEL_MUTEX_INIT;
18001800
}
1801-
_PyChannelState *chan = _channel_new(mutex);
1801+
_channel_state *chan = _channel_new(mutex);
18021802
if (chan == NULL) {
18031803
PyThread_free_lock(mutex);
18041804
return -1;
@@ -1814,7 +1814,7 @@ channel_create(_channels *channels)
18141814
static int
18151815
channel_destroy(_channels *channels, int64_t cid)
18161816
{
1817-
_PyChannelState *chan = NULL;
1817+
_channel_state *chan = NULL;
18181818
int err = _channels_remove(channels, cid, &chan);
18191819
if (err != 0) {
18201820
return err;
@@ -1840,7 +1840,7 @@ channel_send(_channels *channels, int64_t cid, PyObject *obj,
18401840

18411841
// Look up the channel.
18421842
PyThread_type_lock mutex = NULL;
1843-
_PyChannelState *chan = NULL;
1843+
_channel_state *chan = NULL;
18441844
int err = _channels_lookup(channels, cid, &mutex, &chan);
18451845
if (err != 0) {
18461846
return err;
@@ -1884,7 +1884,7 @@ channel_clear_sent(_channels *channels, int64_t cid, _waiting_t *waiting)
18841884
{
18851885
// Look up the channel.
18861886
PyThread_type_lock mutex = NULL;
1887-
_PyChannelState *chan = NULL;
1887+
_channel_state *chan = NULL;
18881888
int err = _channels_lookup(channels, cid, &mutex, &chan);
18891889
if (err != 0) {
18901890
// The channel was already closed, etc.
@@ -1973,7 +1973,7 @@ channel_recv(_channels *channels, int64_t cid, PyObject **res)
19731973

19741974
// Look up the channel.
19751975
PyThread_type_lock mutex = NULL;
1976-
_PyChannelState *chan = NULL;
1976+
_channel_state *chan = NULL;
19771977
err = _channels_lookup(channels, cid, &mutex, &chan);
19781978
if (err != 0) {
19791979
return err;
@@ -2040,7 +2040,7 @@ channel_release(_channels *channels, int64_t cid, int send, int recv)
20402040

20412041
// Look up the channel.
20422042
PyThread_type_lock mutex = NULL;
2043-
_PyChannelState *chan = NULL;
2043+
_channel_state *chan = NULL;
20442044
int err = _channels_lookup(channels, cid, &mutex, &chan);
20452045
if (err != 0) {
20462046
return err;
@@ -2068,7 +2068,7 @@ static int
20682068
channel_is_associated(_channels *channels, int64_t cid, int64_t interpid,
20692069
int send)
20702070
{
2071-
_PyChannelState *chan = NULL;
2071+
_channel_state *chan = NULL;
20722072
int err = _channels_lookup(channels, cid, NULL, &chan);
20732073
if (err != 0) {
20742074
return err;

0 commit comments

Comments
 (0)
0