vance/ryujinx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improves logging to console. (#2146)

Browse Source 
* Restore removed text

* Adds more items to logs:

- Remove #1942

* Further removal of changes from #1942

* Removes hardcoded config state variables for logging
- Adds Configuration logging

* Decoupled logging from ReactiveObject
- Event handler added to Configuration state to handle logging of value changes

* Decoupled logging from ReactiveObject
- Event handler added to Configuration state to handle logging of value changes
This commit is contained in:
Mark Araujo 2021-04-13 20:58:47 +01:00 committed by GitHub
parent 90163087a0
commit faa654dbaf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 49 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
Ryujinx.Common/Configuration/ConfigurationState.cs
View File

@ -155,16 +155,17 @@ namespace Ryujinx.Configuration
public LoggerSection() public LoggerSection()
{ {
EnableDebug = new ReactiveObject<bool>(); EnableDebug = new ReactiveObject<bool>();
EnableStub = new ReactiveObject<bool>(); EnableStub = new ReactiveObject<bool>();
EnableInfo = new ReactiveObject<bool>(); EnableInfo = new ReactiveObject<bool>();
EnableWarn = new ReactiveObject<bool>(); EnableWarn = new ReactiveObject<bool>();
EnableError = new ReactiveObject<bool>(); EnableError = new ReactiveObject<bool>();
EnableGuest = new ReactiveObject<bool>(); EnableGuest = new ReactiveObject<bool>();
EnableFsAccessLog = new ReactiveObject<bool>(); EnableFsAccessLog = new ReactiveObject<bool>();
FilteredClasses = new ReactiveObject<LogClass[]>(); FilteredClasses = new ReactiveObject<LogClass[]>();
EnableFileLog = new ReactiveObject<bool>(); EnableFileLog = new ReactiveObject<bool>();
GraphicsDebugLevel = new ReactiveObject<GraphicsDebugLevel>(); EnableFileLog.Event += static (sender, e) => LogValueChange(sender, e, nameof(EnableFileLog));
GraphicsDebugLevel = new ReactiveObject<GraphicsDebugLevel>();
} }
} }
@ -230,17 +231,24 @@ namespace Ryujinx.Configuration
public SystemSection() public SystemSection()
{ {
Language = new ReactiveObject<Language>(); Language = new ReactiveObject<Language>();
Region = new ReactiveObject<Region>(); Region = new ReactiveObject<Region>();
TimeZone = new ReactiveObject<string>(); TimeZone = new ReactiveObject<string>();
SystemTimeOffset = new ReactiveObject<long>(); SystemTimeOffset = new ReactiveObject<long>();
EnableDockedMode = new ReactiveObject<bool>(); EnableDockedMode = new ReactiveObject<bool>();
EnablePtc = new ReactiveObject<bool>(); EnableDockedMode.Event += static (sender, e) => LogValueChange(sender, e, nameof(EnableDockedMode));
EnableFsIntegrityChecks = new ReactiveObject<bool>(); EnablePtc = new ReactiveObject<bool>();
FsGlobalAccessLogMode = new ReactiveObject<int>(); EnablePtc.Event += static (sender, e) => LogValueChange(sender, e, nameof(EnablePtc));
AudioBackend = new ReactiveObject<AudioBackend>(); EnableFsIntegrityChecks = new ReactiveObject<bool>();
ExpandRam = new ReactiveObject<bool>(); EnableFsIntegrityChecks.Event += static (sender, e) => LogValueChange(sender, e, nameof(EnableFsIntegrityChecks));
IgnoreMissingServices = new ReactiveObject<bool>(); FsGlobalAccessLogMode = new ReactiveObject<int>();
FsGlobalAccessLogMode.Event += static (sender, e) => LogValueChange(sender, e, nameof(FsGlobalAccessLogMode));
AudioBackend = new ReactiveObject<AudioBackend>();
AudioBackend.Event += static (sender, e) => LogValueChange(sender, e, nameof(AudioBackend));
ExpandRam = new ReactiveObject<bool>();
ExpandRam.Event += static (sender, e) => LogValueChange(sender, e, nameof(ExpandRam));
IgnoreMissingServices = new ReactiveObject<bool>();
IgnoreMissingServices.Event += static (sender, e) => LogValueChange(sender, e, nameof(IgnoreMissingServices));
} }
} }
@ -316,13 +324,19 @@ namespace Ryujinx.Configuration
public GraphicsSection() public GraphicsSection()
{ {
ResScale = new ReactiveObject<int>(); ResScale = new ReactiveObject<int>();
ResScaleCustom = new ReactiveObject<float>(); ResScale.Event += static (sender, e) => LogValueChange(sender, e, nameof(ResScale));
MaxAnisotropy = new ReactiveObject<float>(); ResScaleCustom = new ReactiveObject<float>();
AspectRatio = new ReactiveObject<AspectRatio>(); ResScaleCustom.Event += static (sender, e) => LogValueChange(sender, e, nameof(ResScaleCustom));
ShadersDumpPath = new ReactiveObject<string>(); MaxAnisotropy = new ReactiveObject<float>();
EnableVsync = new ReactiveObject<bool>(); MaxAnisotropy.Event += static (sender, e) => LogValueChange(sender, e, nameof(MaxAnisotropy));
EnableShaderCache = new ReactiveObject<bool>(); AspectRatio = new ReactiveObject<AspectRatio>();
AspectRatio.Event += static (sender, e) => LogValueChange(sender, e, nameof(AspectRatio));
ShadersDumpPath = new ReactiveObject<string>();
EnableVsync = new ReactiveObject<bool>();
EnableVsync.Event += static (sender, e) => LogValueChange(sender, e, nameof(EnableVsync));
EnableShaderCache = new ReactiveObject<bool>();
EnableShaderCache.Event += static (sender, e) => LogValueChange(sender, e, nameof(EnableShaderCache));
} }
} }
@ -876,6 +890,11 @@ namespace Ryujinx.Configuration
} }
} }
private static void LogValueChange<T>(object sender, ReactiveEventArgs<T> eventArgs, string valueName)
{
Common.Logging.Logger.Info?.Print(LogClass.Configuration, $"{valueName} set to: {eventArgs.NewValue}");
}
public static void Initialize() public static void Initialize()
{ {
if (Instance != null) if (Instance != null)

1
Ryujinx.Common/Logging/LogClass.cs
View File

@ -5,6 +5,7 @@ namespace Ryujinx.Common.Logging
Application, Application,
Audio, Audio,
AudioRenderer, AudioRenderer,
Configuration,
Cpu, Cpu,
Font, Font,
Emulation, Emulation,

3
Ryujinx.HLE/HOS/Horizon.cs
View File

@ -9,7 +9,6 @@ using Ryujinx.Audio.Output;
using Ryujinx.Audio.Renderer.Device; using Ryujinx.Audio.Renderer.Device;
using Ryujinx.Audio.Renderer.Server; using Ryujinx.Audio.Renderer.Server;
using Ryujinx.Common; using Ryujinx.Common;
using Ryujinx.Common.Logging;
using Ryujinx.Configuration; using Ryujinx.Configuration;
using Ryujinx.HLE.FileSystem.Content; using Ryujinx.HLE.FileSystem.Content;
using Ryujinx.HLE.HOS.Font; using Ryujinx.HLE.HOS.Font;
@ -328,8 +327,6 @@ namespace Ryujinx.HLE.HOS
// Reconfigure controllers // Reconfigure controllers
Device.Hid.RefreshInputConfig(ConfigurationState.Instance.Hid.InputConfig.Value); Device.Hid.RefreshInputConfig(ConfigurationState.Instance.Hid.InputConfig.Value);
Logger.Info?.Print(LogClass.Application, $"IsDocked toggled to: {State.DockedMode}");
} }
} }

6
Ryujinx.HLE/Switch.cs
View File

@ -2,7 +2,6 @@ using LibHac.FsSystem;
using Ryujinx.Audio.Backends.CompatLayer; using Ryujinx.Audio.Backends.CompatLayer;
using Ryujinx.Audio.Integration; using Ryujinx.Audio.Integration;
using Ryujinx.Common; using Ryujinx.Common;
using Ryujinx.Common.Logging;
using Ryujinx.Configuration; using Ryujinx.Configuration;
using Ryujinx.Graphics.GAL; using Ryujinx.Graphics.GAL;
using Ryujinx.Graphics.Gpu; using Ryujinx.Graphics.Gpu;
@ -154,11 +153,6 @@ namespace Ryujinx.HLE
// Configure controllers // Configure controllers
Hid.RefreshInputConfig(ConfigurationState.Instance.Hid.InputConfig.Value); Hid.RefreshInputConfig(ConfigurationState.Instance.Hid.InputConfig.Value);
ConfigurationState.Instance.Hid.InputConfig.Event += Hid.RefreshInputConfigEvent; ConfigurationState.Instance.Hid.InputConfig.Event += Hid.RefreshInputConfigEvent;
Logger.Info?.Print(LogClass.Application, $"AudioBackend: {ConfigurationState.Instance.System.AudioBackend.Value}");
Logger.Info?.Print(LogClass.Application, $"IsDocked: {ConfigurationState.Instance.System.EnableDockedMode.Value}");
Logger.Info?.Print(LogClass.Application, $"Vsync: {ConfigurationState.Instance.Graphics.EnableVsync.Value}");
Logger.Info?.Print(LogClass.Application, $"MemoryConfiguration: {_memoryConfiguration}");
} }
public static IntegrityCheckLevel GetIntegrityCheckLevel() public static IntegrityCheckLevel GetIntegrityCheckLevel()

3
Ryujinx/Ui/GLRenderer.cs
View File

@ -8,7 +8,6 @@ using OpenTK.Input;
using Ryujinx.Common; using Ryujinx.Common;
using Ryujinx.Common.Configuration; using Ryujinx.Common.Configuration;
using Ryujinx.Common.Configuration.Hid; using Ryujinx.Common.Configuration.Hid;
using Ryujinx.Common.Logging;
using Ryujinx.Configuration; using Ryujinx.Configuration;
using Ryujinx.Graphics.OpenGL; using Ryujinx.Graphics.OpenGL;
using Ryujinx.HLE.HOS.Services.Hid; using Ryujinx.HLE.HOS.Services.Hid;
@ -670,8 +669,6 @@ namespace Ryujinx.Ui
!_prevHotkeyButtons.HasFlag(HotkeyButtons.ToggleVSync)) !_prevHotkeyButtons.HasFlag(HotkeyButtons.ToggleVSync))
{ {
_device.EnableDeviceVsync = !_device.EnableDeviceVsync; _device.EnableDeviceVsync = !_device.EnableDeviceVsync;
Logger.Info?.Print(LogClass.Application, $"Vsync toggled to: {_device.EnableDeviceVsync}");
} }
_prevHotkeyButtons = currentHotkeyButtons; _prevHotkeyButtons = currentHotkeyButtons;

10
Ryujinx/Ui/Windows/SettingsWindow.cs
View File

@ -1,10 +1,8 @@
using Gtk; using Gtk;
using Ryujinx.Audio;
using Ryujinx.Audio.Backends.OpenAL; using Ryujinx.Audio.Backends.OpenAL;
using Ryujinx.Audio.Backends.SoundIo; using Ryujinx.Audio.Backends.SoundIo;
using Ryujinx.Common.Configuration; using Ryujinx.Common.Configuration;
using Ryujinx.Common.Configuration.Hid; using Ryujinx.Common.Configuration.Hid;
using Ryujinx.Common.Logging;
using Ryujinx.Configuration; using Ryujinx.Configuration;
using Ryujinx.Configuration.System; using Ryujinx.Configuration.System;
using Ryujinx.HLE.FileSystem; using Ryujinx.HLE.FileSystem;
@ -441,13 +439,7 @@ namespace Ryujinx.Ui.Windows
if (_audioBackendSelect.GetActiveIter(out TreeIter activeIter)) if (_audioBackendSelect.GetActiveIter(out TreeIter activeIter))
{ {
AudioBackend audioBackend = (AudioBackend)_audioBackendStore.GetValue(activeIter, 1); ConfigurationState.Instance.System.AudioBackend.Value = (AudioBackend)_audioBackendStore.GetValue(activeIter, 1);
if (audioBackend != ConfigurationState.Instance.System.AudioBackend.Value)
{
ConfigurationState.Instance.System.AudioBackend.Value = audioBackend;
Logger.Info?.Print(LogClass.Application, $"AudioBackend toggled to: {audioBackend}");
}
} }
ConfigurationState.Instance.ToFileFormat().SaveConfig(Program.ConfigurationPath); ConfigurationState.Instance.ToFileFormat().SaveConfig(Program.ConfigurationPath);