Skip to content

Commit 5086314

Browse files
committed
pythongh-121592: Make select.poll() and related objects thread-safe
This makes select.poll() and kqueue() objects thread-safe in the free-threaded build. Note that calling close() concurrently with other functions is still not thread-safe due to races on file descriptors (pythongh-121544).
1 parent 3ec719f commit 5086314

2 files changed

Lines changed: 70 additions & 17 deletions

File tree

‎Modules/clinic/selectmodule.c.h‎

Lines changed: 46 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Modules/selectmodule.c‎

Lines changed: 24 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -473,6 +473,7 @@ update_ufd_array(pollObject *self)
473473
}
474474

475475
/*[clinic input]
476+
@critical_section
476477
select.poll.register
477478
478479
fd: fildes
@@ -486,7 +487,7 @@ Register a file descriptor with the polling object.
486487

487488
static PyObject *
488489
select_poll_register_impl(pollObject *self, int fd, unsigned short eventmask)
489-
/*[clinic end generated code: output=0dc7173c800a4a65 input=34e16cfb28d3c900]*/
490+
/*[clinic end generated code: output=0dc7173c800a4a65 input=c475e029ce6c2830]*/
490491
{
491492
PyObject *key, *value;
492493
int err;
@@ -514,6 +515,7 @@ select_poll_register_impl(pollObject *self, int fd, unsigned short eventmask)
514515

515516

516517
/*[clinic input]
518+
@critical_section
517519
select.poll.modify
518520
519521
fd: fildes
@@ -528,7 +530,7 @@ Modify an already registered file descriptor.
528530

529531
static PyObject *
530532
select_poll_modify_impl(pollObject *self, int fd, unsigned short eventmask)
531-
/*[clinic end generated code: output=1a7b88bf079eff17 input=a8e383df075c32cf]*/
533+
/*[clinic end generated code: output=1a7b88bf079eff17 input=38c9db5346711872]*/
532534
{
533535
PyObject *key, *value;
534536
int err;
@@ -566,6 +568,7 @@ select_poll_modify_impl(pollObject *self, int fd, unsigned short eventmask)
566568

567569

568570
/*[clinic input]
571+
@critical_section
569572
select.poll.unregister
570573
571574
fd: fildes
@@ -576,7 +579,7 @@ Remove a file descriptor being tracked by the polling object.
576579

577580
static PyObject *
578581
select_poll_unregister_impl(pollObject *self, int fd)
579-
/*[clinic end generated code: output=8c9f42e75e7d291b input=4b4fccc1040e79cb]*/
582+
/*[clinic end generated code: output=8c9f42e75e7d291b input=ae6315d7f5243704]*/
580583
{
581584
PyObject *key;
582585

@@ -599,6 +602,7 @@ select_poll_unregister_impl(pollObject *self, int fd)
599602
}
600603

601604
/*[clinic input]
605+
@critical_section
602606
select.poll.poll
603607
604608
timeout as timeout_obj: object = None
@@ -614,7 +618,7 @@ report, as a list of (fd, event) 2-tuples.
614618

615619
static PyObject *
616620
select_poll_poll_impl(pollObject *self, PyObject *timeout_obj)
617-
/*[clinic end generated code: output=876e837d193ed7e4 input=c2f6953ec45e5622]*/
621+
/*[clinic end generated code: output=876e837d193ed7e4 input=54310631457efdec]*/
618622
{
619623
PyObject *result_list = NULL;
620624
int poll_result, i, j;
@@ -857,6 +861,7 @@ internal_devpoll_register(devpollObject *self, int fd,
857861
}
858862

859863
/*[clinic input]
864+
@critical_section
860865
select.devpoll.register
861866
862867
fd: fildes
@@ -872,12 +877,13 @@ Register a file descriptor with the polling object.
872877
static PyObject *
873878
select_devpoll_register_impl(devpollObject *self, int fd,
874879
unsigned short eventmask)
875-
/*[clinic end generated code: output=6e07fe8b74abba0c input=22006fabe9567522]*/
880+
/*[clinic end generated code: output=6e07fe8b74abba0c input=8d48bd2653a61c42]*/
876881
{
877882
return internal_devpoll_register(self, fd, eventmask, 0);
878883
}
879884

880885
/*[clinic input]
886+
@critical_section
881887
select.devpoll.modify
882888
883889
fd: fildes
@@ -893,12 +899,13 @@ Modify a possible already registered file descriptor.
893899
static PyObject *
894900
select_devpoll_modify_impl(devpollObject *self, int fd,
895901
unsigned short eventmask)
896-
/*[clinic end generated code: output=bc2e6d23aaff98b4 input=09fa335db7cdc09e]*/
902+
/*[clinic end generated code: output=bc2e6d23aaff98b4 input=773b37e9abca2460]*/
897903
{
898904
return internal_devpoll_register(self, fd, eventmask, 1);
899905
}
900906

901907
/*[clinic input]
908+
@critical_section
902909
select.devpoll.unregister
903910
904911
fd: fildes
@@ -909,7 +916,7 @@ Remove a file descriptor being tracked by the polling object.
909916

910917
static PyObject *
911918
select_devpoll_unregister_impl(devpollObject *self, int fd)
912-
/*[clinic end generated code: output=95519ffa0c7d43fe input=b4ea42a4442fd467]*/
919+
/*[clinic end generated code: output=95519ffa0c7d43fe input=6052d368368d4d05]*/
913920
{
914921
if (self->fd_devpoll < 0)
915922
return devpoll_err_closed();
@@ -926,6 +933,7 @@ select_devpoll_unregister_impl(devpollObject *self, int fd)
926933
}
927934

928935
/*[clinic input]
936+
@critical_section
929937
select.devpoll.poll
930938
timeout as timeout_obj: object = None
931939
The maximum time to wait in milliseconds, or else None (or a negative
@@ -940,7 +948,7 @@ report, as a list of (fd, event) 2-tuples.
940948

941949
static PyObject *
942950
select_devpoll_poll_impl(devpollObject *self, PyObject *timeout_obj)
943-
/*[clinic end generated code: output=2654e5457cca0b3c input=3c3f0a355ec2bedb]*/
951+
/*[clinic end generated code: output=2654e5457cca0b3c input=fe7a3f6dcbc118c5]*/
944952
{
945953
struct dvpoll dvp;
946954
PyObject *result_list = NULL;
@@ -1059,6 +1067,7 @@ devpoll_internal_close(devpollObject *self)
10591067
}
10601068

10611069
/*[clinic input]
1070+
@critical_section
10621071
select.devpoll.close
10631072
10641073
Close the devpoll file descriptor.
@@ -1068,7 +1077,7 @@ Further operations on the devpoll object will raise an exception.
10681077

10691078
static PyObject *
10701079
select_devpoll_close_impl(devpollObject *self)
1071-
/*[clinic end generated code: output=26b355bd6429f21b input=6273c30f5560a99b]*/
1080+
/*[clinic end generated code: output=26b355bd6429f21b input=408fde21a377ccfb]*/
10721081
{
10731082
errno = devpoll_internal_close(self);
10741083
if (errno < 0) {
@@ -1088,14 +1097,15 @@ devpoll_get_closed(devpollObject *self, void *Py_UNUSED(ignored))
10881097
}
10891098

10901099
/*[clinic input]
1100+
@critical_section
10911101
select.devpoll.fileno
10921102
10931103
Return the file descriptor.
10941104
[clinic start generated code]*/
10951105

10961106
static PyObject *
10971107
select_devpoll_fileno_impl(devpollObject *self)
1098-
/*[clinic end generated code: output=26920929f8d292f4 input=ef15331ebde6c368]*/
1108+
/*[clinic end generated code: output=26920929f8d292f4 input=8c9db2efa1ade538]*/
10991109
{
11001110
if (self->fd_devpoll < 0)
11011111
return devpoll_err_closed();
@@ -1378,6 +1388,7 @@ pyepoll_dealloc(pyEpoll_Object *self)
13781388
}
13791389

13801390
/*[clinic input]
1391+
@critical_section
13811392
select.epoll.close
13821393
13831394
Close the epoll control file descriptor.
@@ -1387,7 +1398,7 @@ Further operations on the epoll object will raise an exception.
13871398

13881399
static PyObject *
13891400
select_epoll_close_impl(pyEpoll_Object *self)
1390-
/*[clinic end generated code: output=ee2144c446a1a435 input=ca6c66ba5a736bfd]*/
1401+
/*[clinic end generated code: output=ee2144c446a1a435 input=f626a769192e1dbe]*/
13911402
{
13921403
errno = pyepoll_internal_close(self);
13931404
if (errno < 0) {
@@ -2150,6 +2161,7 @@ kqueue_queue_finalize(kqueue_queue_Object *self)
21502161
}
21512162

21522163
/*[clinic input]
2164+
@critical_section
21532165
select.kqueue.close
21542166
21552167
Close the kqueue control file descriptor.
@@ -2159,7 +2171,7 @@ Further operations on the kqueue object will raise an exception.
21592171

21602172
static PyObject *
21612173
select_kqueue_close_impl(kqueue_queue_Object *self)
2162-
/*[clinic end generated code: output=d1c7df0b407a4bc1 input=0b12d95430e0634c]*/
2174+
/*[clinic end generated code: output=d1c7df0b407a4bc1 input=6d763c858b17b690]*/
21632175
{
21642176
errno = kqueue_queue_internal_close(self);
21652177
if (errno < 0) {

0 commit comments

Comments
 (0)