From 48131ce7b87e73da762c2fb013ab0ca5d0988165 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B6nke=20Ludwig?= Date: Tue, 14 Jun 2016 09:26:12 +0200 Subject: [PATCH] Implement generic asyncAwaitAny. This enables waiting for multiple events at the same time. Generic timeout functionality is now also implemented. --- source/vibe/internal/async.d | 113 +++++++++++++++++++++++------------ 1 file changed, 76 insertions(+), 37 deletions(-) diff --git a/source/vibe/internal/async.d b/source/vibe/internal/async.d index fc296c4..f6fa8ac 100644 --- a/source/vibe/internal/async.d +++ b/source/vibe/internal/async.d @@ -10,63 +10,102 @@ import core.time : Duration, seconds; auto asyncAwait(Callback, alias action, alias cancel, string func = __FUNCTION__)() if (!is(Object == Duration)) { - return asyncAwaitImpl!(true, Callback, action, cancel, func)(Duration.max); + Waitable!(action, cancel, ParameterTypeTuple!Callback) waitable; + asyncAwaitAny!(true, func)(waitable); + return tuple(waitable.results); } auto asyncAwait(Callback, alias action, alias cancel, string func = __FUNCTION__)(Duration timeout) { - return asyncAwaitImpl!(true, Callback, action, cancel, func)(timeout); + Waitable!(action, cancel, ParameterTypeTuple!Callback) waitable; + asyncAwaitAny!(true, func)(timeout, waitable); + return tuple(waitable.results); } auto asyncAwaitUninterruptible(Callback, alias action, string func = __FUNCTION__)() nothrow { - return asyncAwaitImpl!(false, Callback, action, (cb) { assert(false); }, func)(Duration.max); + Waitable!(action, (cb) { assert(false, "Action cannot be cancelled."); }, ParameterTypeTuple!Callback) waitable; + asyncAwaitAny!(false, func)(waitable); + return tuple(waitable.results); } auto asyncAwaitUninterruptible(Callback, alias action, alias cancel, string func = __FUNCTION__)(Duration timeout) nothrow { - assert(timeout >= 0.seconds); - asyncAwaitImpl!(false, Callback, action, cancel, func)(timeout); + Waitable!(action, cancel, ParameterTypeTuple!Callback) waitable; + asyncAwaitAny!(false, func)(timeout, waitable); + return tuple(waitable.results); } -private auto asyncAwaitImpl(bool interruptible, Callback, alias action, alias cancel, string func)(Duration timeout) -@safe if (!is(Object == Duration)) { - alias CBTypes = ParameterTypeTuple!Callback; +struct Waitable(alias wait, alias cancel, Results...) { + alias Callback = void delegate(Results) @safe nothrow; + Results results; + bool cancelled; + void waitCallback(Callback cb) { wait(cb); } + void cancelCallback(Callback cb) { cancel(cb); } +} - assert(timeout >= 0.seconds); - assert(timeout == Duration.max, "TODO!"); +void asyncAwaitAny(bool interruptible, string func, Waitables...)(Duration timeout, ref Waitables waitables) +{ + if (timeout == Duration.max) asyncAwaitAny!(interruptible, func)(waitables); + else { + import eventcore.core; - bool fired = false; - CBTypes ret; + auto tm = eventDriver.createTimer(); + eventDriver.setTimer(tm, timeout); + scope (exit) eventDriver.releaseRef(tm); + Waitable!( + cb => eventDriver.waitTimer(tm, cb), + cb => eventDriver.cancelTimerWait(tm, cb), + TimerID + ) timerwaitable; + asyncAwaitAny!(interruptible, func)(timerwaitable, waitables); + } +} + +void asyncAwaitAny(bool interruptible, string func, Waitables...)(ref Waitables waitables) + if (Waitables.length >= 1 && !is(Waitables[0] == Duration)) +{ + import std.meta : staticMap; + import std.algorithm.searching : any; + + /*scope*/ staticMap!(CBDel, Waitables) callbacks; // FIXME: avoid heap delegates + + bool[Waitables.length] fired; Task t; - void callback(CBTypes params) - @safe nothrow { - logTrace("Got result."); - fired = true; - ret = params; - if (t != Task.init) switchToTask(t); + foreach (i, W; Waitables) { + callbacks[i] = (typeof(Waitables[i].results) results) @safe nothrow { + logTrace("Waitable %s fired.", i); + fired[i] = true; + waitables[i].results = results; + if (t != Task.init) switchToTask(t); + }; + + waitables[i].waitCallback(callbacks[i]); + scope (exit) { + if (!fired[i]) { + waitables[i].cancelCallback(callbacks[i]); + assert(fired[i], "The cancellation callback didn't invoke the result callback!"); + } + } + if (fired[i]) return; } - scope cbdel = &callback; + logTrace("Need to wait..."); + t = Task.getThis(); + do { + static if (interruptible) { + bool interrupted = false; + hibernate(() @safe nothrow { + logTrace("Got interrupted."); + interrupted = true; + }); + if (interrupted) + throw new InterruptException; + } else hibernate(); + } while (!fired[].any()); - logTrace("Calling async function in "~func); - action(cbdel); - if (!fired) { - logTrace("Need to wait..."); - t = Task.getThis(); - do { - static if (interruptible) { - bool interrupted = false; - hibernate(() @safe nothrow { - cancel(cbdel); - interrupted = true; - }); - if (interrupted) - throw new InterruptException; // FIXME: the original operation needs to be stopped! or the callback will still be called" - } else hibernate(); - } while (!fired); - } logTrace("Return result."); - return tuple(ret); } + +private alias CBDel(Waitable) = void delegate(typeof(Waitable.results)) @safe nothrow;