summaryrefslogtreecommitdiff
path: root/asyncio/windows_events.py
diff options
context:
space:
mode:
authorGuido van Rossum <guido@python.org>2014-01-31 13:19:24 -0800
committerGuido van Rossum <guido@python.org>2014-01-31 13:19:24 -0800
commit6dd8d720a3399f8ab9079571a55d5b706ab073f3 (patch)
tree23445ec84e8e81778b0e7ed358e79a750a42c7b8 /asyncio/windows_events.py
parent49556edac764ec6fd3619abe7ab8991ec9855cc5 (diff)
downloadtrollius-6dd8d720a3399f8ab9079571a55d5b706ab073f3.tar.gz
Copy a bunch of fixes by Victor for the Proactor event loop from the CPython repo.
Diffstat (limited to 'asyncio/windows_events.py')
-rw-r--r--asyncio/windows_events.py14
1 files changed, 10 insertions, 4 deletions
diff --git a/asyncio/windows_events.py b/asyncio/windows_events.py
index d01de2f..b8574fa 100644
--- a/asyncio/windows_events.py
+++ b/asyncio/windows_events.py
@@ -1,11 +1,12 @@
"""Selector and proactor eventloops for Windows."""
+import _winapi
import errno
+import math
import socket
+import struct
import subprocess
import weakref
-import struct
-import _winapi
from . import events
from . import base_subprocess
@@ -190,6 +191,7 @@ class IocpProactor:
self._cache = {}
self._registered = weakref.WeakSet()
self._stopped_serving = weakref.WeakSet()
+ self.resolution = 1e-3
def set_loop(self, loop):
self._loop = loop
@@ -325,7 +327,9 @@ class IocpProactor:
if timeout is None:
ms = _winapi.INFINITE
else:
- ms = int(timeout * 1000 + 0.5)
+ # RegisterWaitForSingleObject() has a resolution of 1 millisecond,
+ # round away from zero to wait *at least* timeout seconds.
+ ms = math.ceil(timeout * 1e3)
# We only create ov so we can use ov.address as a key for the cache.
ov = _overlapped.Overlapped(NULL)
@@ -396,7 +400,9 @@ class IocpProactor:
elif timeout < 0:
raise ValueError("negative timeout")
else:
- ms = int(timeout * 1000 + 0.5)
+ # GetQueuedCompletionStatus() has a resolution of 1 millisecond,
+ # round away from zero to wait *at least* timeout seconds.
+ ms = math.ceil(timeout * 1e3)
if ms >= INFINITE:
raise ValueError("timeout too big")
while True: