diff options
| author | Victor Stinner <victor.stinner@gmail.com> | 2014-01-25 13:40:04 (GMT) |
|---|---|---|
| committer | Victor Stinner <victor.stinner@gmail.com> | 2014-01-25 13:40:04 (GMT) |
| commit | 38c72bd1996164a6f3f90df998f0b9627b07138a (patch) | |
| tree | d3a506f366392a302ad3583f880751398dafc6f2 | |
| parent | 98c779e8da8fd248a2ccb328f72e45f68406daf6 (diff) | |
| parent | 933209689e8d07e3ce00c68ca26e001b130f0b62 (diff) | |
| download | cpython-38c72bd1996164a6f3f90df998f0b9627b07138a.zip cpython-38c72bd1996164a6f3f90df998f0b9627b07138a.tar.gz cpython-38c72bd1996164a6f3f90df998f0b9627b07138a.tar.bz2 | |
(Merge 3.3) Issue #20311: Revert 033137c12d88 (02f9db3e684e),
select.epoll.poll() rounds again the timeout towards zero
| -rw-r--r-- | Lib/test/test_epoll.py | 11 | ||||
| -rw-r--r-- | Misc/NEWS | 4 | ||||
| -rw-r--r-- | Modules/selectmodule.c | 4 |
3 files changed, 1 insertions, 18 deletions
diff --git a/Lib/test/test_epoll.py b/Lib/test/test_epoll.py index 58dd92f..0c88cc4 100644 --- a/Lib/test/test_epoll.py +++ b/Lib/test/test_epoll.py @@ -254,17 +254,6 @@ class TestEPoll(unittest.TestCase): self.addCleanup(epoll.close) self.assertEqual(os.get_inheritable(epoll.fileno()), False) - 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.monotonic() - epoll.poll(timeout) - dt = time.monotonic() - t0 - self.assertGreaterEqual(dt, timeout) - def test_main(): support.run_unittest(TestEPoll) @@ -53,10 +53,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. diff --git a/Modules/selectmodule.c b/Modules/selectmodule.c index 0c9b9d9..d44e8de 100644 --- a/Modules/selectmodule.c +++ b/Modules/selectmodule.c @@ -1458,9 +1458,7 @@ pyepoll_poll(pyEpoll_Object *self, PyObject *args, PyObject *kwds) return NULL; } else { - /* epoll_wait() has a resolution of 1 millisecond, round away from zero - to wait *at least* dtimeout seconds. */ - timeout = (int)ceil(dtimeout * 1000.0); + timeout = (int)(dtimeout * 1000.0); } if (maxevents == -1) { |