mirror of
https://github.com/python/cpython
synced 2024-10-14 09:01:41 +00:00
selectors: Make sure EpollSelecrtor.select() works when no FD is registered.
Closes issue #23009.
This commit is contained in:
commit
7f98d3ecb8
|
@ -418,7 +418,12 @@ def select(self, timeout=None):
|
|||
# epoll_wait() has a resolution of 1 millisecond, round away
|
||||
# from zero to wait *at least* timeout seconds.
|
||||
timeout = math.ceil(timeout * 1e3) * 1e-3
|
||||
max_ev = len(self._fd_to_key)
|
||||
|
||||
# epoll_wait() expectcs `maxevents` to be greater than zero;
|
||||
# we want to make sure that `select()` can be called when no
|
||||
# FD is registered.
|
||||
max_ev = max(len(self._fd_to_key), 1)
|
||||
|
||||
ready = []
|
||||
try:
|
||||
fd_event_list = self._epoll.poll(timeout, max_ev)
|
||||
|
|
|
@ -316,6 +316,11 @@ def test_selector(self):
|
|||
|
||||
self.assertEqual(bufs, [MSG] * NUM_SOCKETS)
|
||||
|
||||
def test_empty_select(self):
|
||||
s = self.SELECTOR()
|
||||
self.addCleanup(s.close)
|
||||
self.assertEqual(s.select(timeout=0), [])
|
||||
|
||||
def test_timeout(self):
|
||||
s = self.SELECTOR()
|
||||
self.addCleanup(s.close)
|
||||
|
|
Loading…
Reference in a new issue