From dcd9740ad2932f4049e912d8721933696373fe4c Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Fri, 31 Jan 2014 12:12:53 +0100 Subject: Issue #20452: select and selectors round (again) timeout away from zero for poll and epoll Improve also debug info to analyze the issue --- Lib/selectors.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'Lib/selectors.py') diff --git a/Lib/selectors.py b/Lib/selectors.py index b1b530afcb..52ee8dbd56 100644 --- a/Lib/selectors.py +++ b/Lib/selectors.py @@ -8,6 +8,7 @@ This module allows high-level and efficient I/O multiplexing, built upon the from abc import ABCMeta, abstractmethod, abstractproperty from collections import namedtuple, Mapping import functools +import math import select import sys @@ -369,8 +370,9 @@ if hasattr(select, 'poll'): elif timeout <= 0: timeout = 0 else: - # Round towards zero - timeout = int(timeout * 1000) + # poll() has a resolution of 1 millisecond, round away from + # zero to wait *at least* timeout seconds. + timeout = int(math.ceil(timeout * 1e3)) ready = [] try: fd_event_list = self._poll.poll(timeout) @@ -430,6 +432,10 @@ if hasattr(select, 'epoll'): timeout = -1 elif timeout <= 0: timeout = 0 + else: + # epoll_wait() has a resolution of 1 millisecond, round away + # from zero to wait *at least* timeout seconds. + timeout = math.ceil(timeout * 1e3) * 1e-3 max_ev = len(self._fd_to_key) ready = [] try: -- cgit v1.2.1