(Merge 3.3) Issue #20311: Revert 033137c12d88 (02f9db3e684e),

select.epoll.poll() rounds again the timeout towards zero
This commit is contained in:
Victor Stinner 2014-01-25 14:40:04 +01:00
commit 38c72bd199
3 changed files with 1 additions and 18 deletions

View file

@ -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) {