Commit be31e4a3 authored by Victor Stinner's avatar Victor Stinner

Issue #20505: BaseEventLoop uses again the resolution of the clock to decide if

scheduled tasks should be executed or not.
parent 6e0bdb0b
...@@ -96,6 +96,7 @@ class BaseEventLoop(events.AbstractEventLoop): ...@@ -96,6 +96,7 @@ class BaseEventLoop(events.AbstractEventLoop):
self._default_executor = None self._default_executor = None
self._internal_fds = 0 self._internal_fds = 0
self._running = False self._running = False
self._clock_resolution = time.get_clock_info('monotonic').resolution
def _make_socket_transport(self, sock, protocol, waiter=None, *, def _make_socket_transport(self, sock, protocol, waiter=None, *,
extra=None, server=None): extra=None, server=None):
...@@ -643,10 +644,10 @@ class BaseEventLoop(events.AbstractEventLoop): ...@@ -643,10 +644,10 @@ class BaseEventLoop(events.AbstractEventLoop):
self._process_events(event_list) self._process_events(event_list)
# Handle 'later' callbacks that are ready. # Handle 'later' callbacks that are ready.
now = self.time() end_time = self.time() + self._clock_resolution
while self._scheduled: while self._scheduled:
handle = self._scheduled[0] handle = self._scheduled[0]
if handle._when > now: if handle._when >= end_time:
break break
handle = heapq.heappop(self._scheduled) handle = heapq.heappop(self._scheduled)
self._ready.append(handle) self._ready.append(handle)
......
...@@ -1178,15 +1178,15 @@ class EventLoopTestsMixin: ...@@ -1178,15 +1178,15 @@ class EventLoopTestsMixin:
yield from asyncio.sleep(1e-4, loop=loop) yield from asyncio.sleep(1e-4, loop=loop)
yield from asyncio.sleep(1e-6, loop=loop) yield from asyncio.sleep(1e-6, loop=loop)
yield from asyncio.sleep(1e-8, loop=loop) yield from asyncio.sleep(1e-8, loop=loop)
yield from asyncio.sleep(1e-10, loop=loop)
self.loop.run_until_complete(wait()) self.loop.run_until_complete(wait())
# The ideal number of call is 10, but on some platforms, the selector # The ideal number of call is 12, but on some platforms, the selector
# may sleep at little bit less than timeout depending on the resolution # may sleep at little bit less than timeout depending on the resolution
# of the clock used by the kernel. Tolerate 5 useless calls on these # of the clock used by the kernel. Tolerate a few useless calls on
# platforms. # these platforms.
self.assertLessEqual(self.loop._run_once_counter, 15, self.assertLessEqual(self.loop._run_once_counter, 20,
{'time_info': time.get_clock_info('time'), {'clock_resolution': self.loop._clock_resolution,
'monotonic_info': time.get_clock_info('monotonic'),
'selector': self.loop._selector.__class__.__name__}) 'selector': self.loop._selector.__class__.__name__})
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment