From 665486e0e73f6e1cc0a54d1ac1e977b7cff7b085 Mon Sep 17 00:00:00 2001
From: Victor Stinner <victor.stinner@gmail.com>
Date: Tue, 21 Jan 2014 01:41:00 +0100
Subject: [PATCH] Issue #20311: select.epoll.poll() now rounds the timeout away
 from zero, instead of rounding towards zero. For example, a timeout of one
 microsecond is now rounded to one millisecond, instead of being rounded to
 zero.

---
 Lib/test/test_epoll.py | 11 +++++++++++
 Misc/NEWS              |  4 ++++
 Modules/selectmodule.c |  4 +++-
 3 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/Lib/test/test_epoll.py b/Lib/test/test_epoll.py
index 7f9547ff959..ad545d3a3b1 100644
--- a/Lib/test/test_epoll.py
+++ b/Lib/test/test_epoll.py
@@ -46,6 +46,17 @@ class TestEPoll(unittest.TestCase):
         self.serverSocket.listen(1)
         self.connections = [self.serverSocket]
 
+    def test_timeout_rounding(self):
+        # epoll_wait() has a resolution of 1 millisecond, check if the timeout
+        # is correctly rounded to the upper bound
+        epoll = select.epoll()
+        self.addCleanup(epoll.close)
+        for timeout in (1e-2, 1e-3, 1e-4):
+            t0 = time.perf_counter()
+            epoll.poll(timeout)
+            dt = time.perf_counter() - t0
+            self.assertGreaterEqual(dt, timeout)
+
 
     def tearDown(self):
         for skt in self.connections:
diff --git a/Misc/NEWS b/Misc/NEWS
index 62ffaa508a3..e470fa90286 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -43,6 +43,10 @@ Core and Builtins
 Library
 -------
 
+- Issue #20311: select.epoll.poll() now rounds the timeout away from zero,
+  instead of rounding towards zero. For example, a timeout of one microsecond
+  is now rounded to one millisecond, instead of being rounded to zero.
+
 - Issue #20262: Warnings are raised now when duplicate names are added in the
   ZIP file or too long ZIP file comment is truncated.
 
diff --git a/Modules/selectmodule.c b/Modules/selectmodule.c
index c492224ecbc..ab2016a9819 100644
--- a/Modules/selectmodule.c
+++ b/Modules/selectmodule.c
@@ -1379,7 +1379,9 @@ pyepoll_poll(pyEpoll_Object *self, PyObject *args, PyObject *kwds)
         return NULL;
     }
     else {
-        timeout = (int)(dtimeout * 1000.0);
+        /* epoll_wait() has a resolution of 1 millisecond, round away from zero
+           to wait *at least* dtimeout seconds. */
+        timeout = (int)ceil(dtimeout * 1000.0);
     }
 
     if (maxevents == -1) {