changeset:   88593:02f9db3e684e
parent:      88591:8bb2c3ae9402
parent:      88592:033137c12d88
user:        Victor Stinner <victor.stinner@gmail.com>
date:        Tue Jan 21 01:42:11 2014 +0100
files:       Lib/test/test_epoll.py Misc/NEWS Modules/selectmodule.c
description:
(Merge 3.3) 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.


diff -r 8bb2c3ae9402 -r 02f9db3e684e Lib/test/test_epoll.py
--- a/Lib/test/test_epoll.py	Mon Jan 20 23:56:40 2014 +0100
+++ b/Lib/test/test_epoll.py	Tue Jan 21 01:42:11 2014 +0100
@@ -47,6 +47,17 @@
         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 -r 8bb2c3ae9402 -r 02f9db3e684e Misc/NEWS
--- a/Misc/NEWS	Mon Jan 20 23:56:40 2014 +0100
+++ b/Misc/NEWS	Tue Jan 21 01:42:11 2014 +0100
@@ -25,6 +25,10 @@
 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 -r 8bb2c3ae9402 -r 02f9db3e684e Modules/selectmodule.c
--- a/Modules/selectmodule.c	Mon Jan 20 23:56:40 2014 +0100
+++ b/Modules/selectmodule.c	Tue Jan 21 01:42:11 2014 +0100
@@ -1458,7 +1458,9 @@
         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) {