01a4c80ed5
The configuration system was quite fragile and too dependent on everything, this fix #812 . The changes: The file configuration is now entirely independent from the internal configuration state. The file configuration is versioned (current version is 1). Every configuration elements are now reactive properties that the emulator can register on to handle initialization and configuration changes. The configuration system is now in Ryujinx.Common to be accessible on every projects. Discord integration is now independent from the UI and can be reloaded. The primary controller is now configurable at runtime (NOTE: the UI currently doesn't have any options to configure real controller). The logger is entirely reloadable. You can now hotplug your controller when the emulator is running. The logger now takes name for every LogTarget to make them removable at runtime. The logger now always add the default "console" target to avoid loosing early init logs. The configuration system now generates a default file configuration if it's missing or too new. General system stability improvements to enhance the user's experience
78 lines
2.3 KiB
C#
78 lines
2.3 KiB
C#
using System;
|
|
using System.Collections.Concurrent;
|
|
using System.Threading;
|
|
|
|
namespace Ryujinx.Common.Logging
|
|
{
|
|
public enum AsyncLogTargetOverflowAction
|
|
{
|
|
/// <summary>
|
|
/// Block until there's more room in the queue
|
|
/// </summary>
|
|
Block = 0,
|
|
|
|
/// <summary>
|
|
/// Discard the overflowing item
|
|
/// </summary>
|
|
Discard = 1
|
|
}
|
|
|
|
public class AsyncLogTargetWrapper : ILogTarget
|
|
{
|
|
private ILogTarget _target;
|
|
|
|
private Thread _messageThread;
|
|
|
|
private BlockingCollection<LogEventArgs> _messageQueue;
|
|
|
|
private readonly int _overflowTimeout;
|
|
|
|
string ILogTarget.Name { get => _target.Name; }
|
|
|
|
public AsyncLogTargetWrapper(ILogTarget target)
|
|
: this(target, -1, AsyncLogTargetOverflowAction.Block)
|
|
{ }
|
|
|
|
public AsyncLogTargetWrapper(ILogTarget target, int queueLimit, AsyncLogTargetOverflowAction overflowAction)
|
|
{
|
|
_target = target;
|
|
_messageQueue = new BlockingCollection<LogEventArgs>(queueLimit);
|
|
_overflowTimeout = overflowAction == AsyncLogTargetOverflowAction.Block ? -1 : 0;
|
|
|
|
_messageThread = new Thread(() => {
|
|
while (!_messageQueue.IsCompleted)
|
|
{
|
|
try
|
|
{
|
|
_target.Log(this, _messageQueue.Take());
|
|
}
|
|
catch (InvalidOperationException)
|
|
{
|
|
// IOE means that Take() was called on a completed collection.
|
|
// Some other thread can call CompleteAdding after we pass the
|
|
// IsCompleted check but before we call Take.
|
|
// We can simply catch the exception since the loop will break
|
|
// on the next iteration.
|
|
}
|
|
}
|
|
});
|
|
|
|
_messageThread.IsBackground = true;
|
|
_messageThread.Start();
|
|
}
|
|
|
|
public void Log(object sender, LogEventArgs e)
|
|
{
|
|
if (!_messageQueue.IsAddingCompleted)
|
|
{
|
|
_messageQueue.TryAdd(e, _overflowTimeout);
|
|
}
|
|
}
|
|
|
|
public void Dispose()
|
|
{
|
|
_messageQueue.CompleteAdding();
|
|
_messageThread.Join();
|
|
}
|
|
}
|
|
} |