diff options
author | Victor Stinner <victor.stinner@gmail.com> | 2014-08-28 11:14:14 +0200 |
---|---|---|
committer | Victor Stinner <victor.stinner@gmail.com> | 2014-08-28 11:14:14 +0200 |
commit | dc641c8e14fac41d01c2daec9e76b2543debd05a (patch) | |
tree | 40b95b13178bd7da64ed1a28605035dee16fd666 /asyncio/tasks.py | |
parent | de83cc680038fa5a40cd90f0a00db5c8d941437a (diff) | |
download | trollius-dc641c8e14fac41d01c2daec9e76b2543debd05a.tar.gz |
Tulip issue #201: Fix a race condition in wait_for()
Don't raise a TimeoutError if we reached the timeout and the future completed
in the same iteration of the event loop. A side effect of the bug is that
Queue.get() looses items.
Diffstat (limited to 'asyncio/tasks.py')
-rw-r--r-- | asyncio/tasks.py | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/asyncio/tasks.py b/asyncio/tasks.py index 9207016..c556e44 100644 --- a/asyncio/tasks.py +++ b/asyncio/tasks.py @@ -330,9 +330,9 @@ def wait(fs, *, loop=None, timeout=None, return_when=ALL_COMPLETED): return (yield from _wait(fs, timeout, return_when, loop)) -def _release_waiter(waiter, value=True, *args): +def _release_waiter(waiter, *args): if not waiter.done(): - waiter.set_result(value) + waiter.set_result(None) @coroutine @@ -357,14 +357,17 @@ def wait_for(fut, timeout, *, loop=None): return (yield from fut) waiter = futures.Future(loop=loop) - timeout_handle = loop.call_later(timeout, _release_waiter, waiter, False) - cb = functools.partial(_release_waiter, waiter, True) + timeout_handle = loop.call_later(timeout, _release_waiter, waiter) + cb = functools.partial(_release_waiter, waiter) fut = async(fut, loop=loop) fut.add_done_callback(cb) try: - if (yield from waiter): + # wait until the future completes or the timeout + yield from waiter + + if fut.done(): return fut.result() else: fut.remove_done_callback(cb) @@ -397,7 +400,7 @@ def _wait(fs, timeout, return_when, loop): if timeout_handle is not None: timeout_handle.cancel() if not waiter.done(): - waiter.set_result(False) + waiter.set_result(None) for f in fs: f.add_done_callback(_on_completion) |