liz/PluralKit
liz/PluralKit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Split HandlerQueue logic into Predicate/Handler

Browse Source
This commit is contained in:
Ske 2020-07-22 01:19:23 +02:00
parent 577629c28a
commit 94076dc9be
1 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
PluralKit.Core/Utils/HandlerQueue.cs
View File

@ -12,27 +12,18 @@ namespace PluralKit.Core
private long _seq; private long _seq;
private readonly ConcurrentDictionary<long, HandlerEntry> _handlers = new ConcurrentDictionary<long, HandlerEntry>(); private readonly ConcurrentDictionary<long, HandlerEntry> _handlers = new ConcurrentDictionary<long, HandlerEntry>();
public HandlerEntry Add(Func<T, Task<bool>> handler)
{
var entry = new HandlerEntry {Handler = handler};
_handlers[Interlocked.Increment(ref _seq)] = entry;
return entry;
}
public async Task<T> WaitFor(Func<T, bool> predicate, Duration? timeout = null, CancellationToken ct = default) public async Task<T> WaitFor(Func<T, bool> predicate, Duration? timeout = null, CancellationToken ct = default)
{ {
var timeoutTask = Task.Delay(timeout?.ToTimeSpan() ?? TimeSpan.FromMilliseconds(-1), ct); var timeoutTask = Task.Delay(timeout?.ToTimeSpan() ?? TimeSpan.FromMilliseconds(-1), ct);
var tcs = new TaskCompletionSource<T>(); var tcs = new TaskCompletionSource<T>();
Task<bool> Handler(T e) ValueTask Handler(T e)
{ {
var matches = predicate(e); tcs.SetResult(e);
if (matches) tcs.SetResult(e); return default;
return Task.FromResult(matches);
} }
var entry = new HandlerEntry {Handler = Handler}; var entry = new HandlerEntry {Predicate = predicate, Handler = Handler};
_handlers[Interlocked.Increment(ref _seq)] = entry; _handlers[Interlocked.Increment(ref _seq)] = entry;
// Wait for either the event task or the timeout task // Wait for either the event task or the timeout task
@ -63,8 +54,9 @@ namespace PluralKit.Core
foreach (var (_, entry) in _handlers) foreach (var (_, entry) in _handlers)
{ {
if (entry.Expiry < now) entry.Alive = false; if (entry.Expiry < now) entry.Alive = false;
else if (entry.Alive && await entry.Handler(evt)) else if (entry.Alive && entry.Predicate(evt))
{ {
await entry.Handler(evt);
entry.Alive = false; entry.Alive = false;
return true; return true;
} }
@ -75,7 +67,8 @@ namespace PluralKit.Core
public class HandlerEntry public class HandlerEntry
{ {
internal Func<T, Task<bool>> Handler; internal Func<T, ValueTask> Handler;
internal Func<T, bool> Predicate;
internal bool Alive = true; internal bool Alive = true;
internal Instant Expiry = SystemClock.Instance.GetCurrentInstant() + Duration.FromMinutes(30); internal Instant Expiry = SystemClock.Instance.GetCurrentInstant() + Duration.FromMinutes(30);