From: Yury Selivanov <yselivanov@sprymix.com>
Date: Mon, 8 Dec 2014 17:21:58 +0000 (-0500)
Subject: selectors: Make sure EpollSelecrtor.select() works when no FD is registered.
X-Git-Tag: v3.4.3rc1~250
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d60ef4aa9daff89af06117e7e2ae83adfb8c9dce;p=thirdparty%2FPython%2Fcpython.git

selectors: Make sure EpollSelecrtor.select() works when no FD is registered.

Closes issue #23009.
---

diff --git a/Lib/selectors.py b/Lib/selectors.py
index 9be9225537f0..25b8d798219e 100644
--- a/Lib/selectors.py
+++ b/Lib/selectors.py
@@ -418,7 +418,12 @@ if hasattr(select, 'epoll'):
                 # 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)
diff --git a/Lib/test/test_selectors.py b/Lib/test/test_selectors.py
index 46026be0aa60..c08a3c498916 100644
--- a/Lib/test/test_selectors.py
+++ b/Lib/test/test_selectors.py
@@ -319,6 +319,11 @@ class BaseSelectorTestCase(unittest.TestCase):
 
         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)