cpython: 900a1ff323bb (original) (raw)
Mercurial > cpython
changeset 88692:900a1ff323bb 3.3
Issue #20311: Revert 033137c12d88, select.epoll.poll() rounds again the timeout towards zero [#20311]
| Victor Stinner victor.stinner@gmail.com | |
|---|---|
| date | Sat, 25 Jan 2014 14:37:50 +0100 |
| parents | a516eec7117e |
| children | caab3e191485 2766320bdb10 |
| files | Lib/test/test_epoll.py Misc/NEWS Modules/selectmodule.c |
| diffstat | 3 files changed, 2 insertions(+), 19 deletions(-)[+] [-] Lib/test/test_epoll.py 11 Misc/NEWS 6 Modules/selectmodule.c 4 |
line wrap: on
line diff
--- a/Lib/test/test_epoll.py +++ b/Lib/test/test_epoll.py @@ -217,17 +217,6 @@ class TestEPoll(unittest.TestCase): server.close() ep.unregister(fd)
- def test_timeout_rounding(self):
# epoll_wait() has a resolution of 1 millisecond, check if the timeout[](#l1.8)# is correctly rounded to the upper bound[](#l1.9)epoll = select.epoll()[](#l1.10)self.addCleanup(epoll.close)[](#l1.11)for timeout in (1e-2, 1e-3, 1e-4):[](#l1.12)t0 = time.monotonic()[](#l1.13)epoll.poll(timeout)[](#l1.14)dt = time.monotonic() - t0[](#l1.15)self.assertGreaterEqual(dt, timeout)[](#l1.16)
- def test_main(): support.run_unittest(TestEPoll)
--- a/Misc/NEWS +++ b/Misc/NEWS @@ -58,10 +58,6 @@ Library
- Issue #20374: Fix build with GNU readline >= 6.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. -
- Issue #20262: Warnings are raised now when duplicate names are added in the ZIP file or too long ZIP file comment is truncated. @@ -278,7 +274,7 @@ IDLE --Issue #17390: Add Python version to Idle editor window title bar. Original patches by Edmond Burnett and Kent Johnson.
- +
- Issue #18960: IDLE now ignores the source encoding declaration on the second line if the first line contains anything except a comment.
--- a/Modules/selectmodule.c +++ b/Modules/selectmodule.c @@ -1379,9 +1379,7 @@ pyepoll_poll(pyEpoll_Object *self, PyObj return NULL; } else {
/* epoll_wait() has a resolution of 1 millisecond, round away from zero[](#l3.7)to wait *at least* dtimeout seconds. */[](#l3.8)timeout = (int)ceil(dtimeout * 1000.0);[](#l3.9)