summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@gmail.com>2014-01-21 00:41:00 (GMT)
committerVictor Stinner <victor.stinner@gmail.com>2014-01-21 00:41:00 (GMT)
commit665486e0e73f6e1cc0a54d1ac1e977b7cff7b085 (patch)
tree4154653a1e07f67ce896221322aec091e623f65d /Modules
parent9b7a1a1af6de71411102e2b95ee3f654cb0cc700 (diff)
downloadcpython-665486e0e73f6e1cc0a54d1ac1e977b7cff7b085.zip
cpython-665486e0e73f6e1cc0a54d1ac1e977b7cff7b085.tar.gz
cpython-665486e0e73f6e1cc0a54d1ac1e977b7cff7b085.tar.bz2
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.
Diffstat (limited to 'Modules')
-rw-r--r--Modules/selectmodule.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/Modules/selectmodule.c b/Modules/selectmodule.c
index c492224..ab2016a 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) {