forked from Mirror/Ryujinx
42b9c1e8fe
* Attempt at fixing hang on exit by ending the WindowNotificationManager notification loop, so that the Thread running it can exit. * explicitly apply the NotificationManager template to allow the notification loop to begin * NotificationHelper - remove explicity call to ApplyTemplate(). Change to ManualResetEventSlim so we can cancel the Wait on it. * add a timeout to AudioRenderSystem.Stop()'s waiting for the termination signal, log a warning if this timeout occurs, and continue execution * NotifiationHelper - cancel first, the CompleteAdding() * Remove AudioRenderSystem._terminationEvent, redundant * NotificationHelper - use host.Closing event to trigger cancellation instead of _notifationManager.DetachedFromLogicalTree * Change NotificationHelper to use an explicit Thread for background work. Wait on the cancellationToken's WaitHandle so the Thread doesn't have to deal with async. Wrap foreach in try/catch (OperationCanceledException) to swallow the escaping exception from the GetConsumingEnumerable(). * adjust formatting of AsyncWorkQueue constructor to use object initializers consistently * use AsyncWorkQueue to do everything I added in SetNotificationManager() * Revert "use AsyncWorkQueue to do everything I added in SetNotificationManager()" This reverts commit f0e78366b8776ec8e2fef8ab023c0db1833155d3. * use AsyncWorkQueue to handle the Thread-related changes previously made to NotificationHelper.SetNotificationHelper(). Wrap it in Lazy<T> and force instantiation in the TemplateApplied event handler to accomodate for the fact that AsyncWorkQueue starts immediately, and the notification dispatch loop was being delayed by _templateAppliedEvent. * impl changes suggested by AcK77 * impl changes suggested by AcK77 (more)
102 lines
2.6 KiB
C#
102 lines
2.6 KiB
C#
using System;
|
|
using System.Collections.Concurrent;
|
|
using System.Threading;
|
|
|
|
namespace Ryujinx.Common
|
|
{
|
|
public sealed class AsyncWorkQueue<T> : IDisposable
|
|
{
|
|
private readonly Thread _workerThread;
|
|
private readonly CancellationTokenSource _cts;
|
|
private readonly Action<T> _workerAction;
|
|
private readonly BlockingCollection<T> _queue;
|
|
|
|
public bool IsCancellationRequested => _cts.IsCancellationRequested;
|
|
|
|
public AsyncWorkQueue(Action<T> callback, string name = null) : this(callback, name, new BlockingCollection<T>())
|
|
{
|
|
}
|
|
|
|
public AsyncWorkQueue(Action<T> callback, string name, BlockingCollection<T> collection)
|
|
{
|
|
_cts = new CancellationTokenSource();
|
|
_queue = collection;
|
|
_workerAction = callback;
|
|
_workerThread = new Thread(DoWork)
|
|
{
|
|
Name = name,
|
|
IsBackground = true
|
|
};
|
|
_workerThread.Start();
|
|
}
|
|
|
|
private void DoWork()
|
|
{
|
|
try
|
|
{
|
|
foreach (var item in _queue.GetConsumingEnumerable(_cts.Token))
|
|
{
|
|
_workerAction(item);
|
|
}
|
|
}
|
|
catch (OperationCanceledException)
|
|
{
|
|
}
|
|
}
|
|
|
|
public void Cancel()
|
|
{
|
|
_cts.Cancel();
|
|
}
|
|
|
|
public void CancelAfter(int millisecondsDelay)
|
|
{
|
|
_cts.CancelAfter(millisecondsDelay);
|
|
}
|
|
|
|
public void CancelAfter(TimeSpan delay)
|
|
{
|
|
_cts.CancelAfter(delay);
|
|
}
|
|
|
|
public void Add(T workItem)
|
|
{
|
|
_queue.Add(workItem);
|
|
}
|
|
|
|
public void Add(T workItem, CancellationToken cancellationToken)
|
|
{
|
|
_queue.Add(workItem, cancellationToken);
|
|
}
|
|
|
|
public bool TryAdd(T workItem)
|
|
{
|
|
return _queue.TryAdd(workItem);
|
|
}
|
|
|
|
public bool TryAdd(T workItem, int millisecondsDelay)
|
|
{
|
|
return _queue.TryAdd(workItem, millisecondsDelay);
|
|
}
|
|
|
|
public bool TryAdd(T workItem, int millisecondsDelay, CancellationToken cancellationToken)
|
|
{
|
|
return _queue.TryAdd(workItem, millisecondsDelay, cancellationToken);
|
|
}
|
|
|
|
public bool TryAdd(T workItem, TimeSpan timeout)
|
|
{
|
|
return _queue.TryAdd(workItem, timeout);
|
|
}
|
|
|
|
public void Dispose()
|
|
{
|
|
_queue.CompleteAdding();
|
|
_cts.Cancel();
|
|
_workerThread.Join();
|
|
|
|
_queue.Dispose();
|
|
_cts.Dispose();
|
|
}
|
|
}
|
|
}
|