ryujinx/Ryujinx
1
0
Fork 0
mirror of https://github.com/Ryujinx/Ryujinx.git synced 2024-11-08 05:58:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

[Logger] Add print with stacktrace method (#5129)

Browse source 
* Add print with stacktrace method

* Adjust logging namespaces

* Add static keyword to DynamicObjectFormatter
This commit is contained in:
TSRBerry 2023-06-01 15:47:53 +02:00 committed by GitHub
parent 12c62fdbc2
commit f4539c49d8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
12 changed files with 44 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/Ryujinx.Common/Logging/Formatters/DefaultLogFormatter.cs
View file

@ -1,6 +1,7 @@
using System.Text;
using System.Diagnostics;
using System.Text;
namespace Ryujinx.Common.Logging
namespace Ryujinx.Common.Logging.Formatters
{
internal class DefaultLogFormatter : ILogFormatter
{
@ -27,6 +28,14 @@ namespace Ryujinx.Common.Logging
if (args.Data is not null)
{
if (args.Data is StackTrace trace)
{
sb.Append('\n');
sb.Append(trace);
return sb.ToString();
}
sb.Append(' ');
DynamicObjectFormatter.Format(sb, args.Data);
}
@ -39,4 +48,4 @@ namespace Ryujinx.Common.Logging
}
}
}
}
}

6
src/Ryujinx.Common/Logging/Formatters/DynamicObjectFormatter.cs
View file

@ -3,9 +3,9 @@ using System;
using System.Reflection;
using System.Text;
namespace Ryujinx.Common.Logging
namespace Ryujinx.Common.Logging.Formatters
{
internal class DynamicObjectFormatter
internal static class DynamicObjectFormatter
{
private static readonly ObjectPool<StringBuilder> StringBuilderPool = SharedPools.Default<StringBuilder>();
@ -17,7 +17,7 @@ namespace Ryujinx.Common.Logging
}
StringBuilder sb = StringBuilderPool.Allocate();
try
{
Format(sb, dynamicObject);

4
src/Ryujinx.Common/Logging/Formatters/ILogFormatter.cs
View file

@ -1,7 +1,7 @@
namespace Ryujinx.Common.Logging
namespace Ryujinx.Common.Logging.Formatters
{
interface ILogFormatter
{
string Format(LogEventArgs args);
}
}
}

3
src/Ryujinx.Common/Logging/LogEventArgsJson.cs
View file

@ -1,4 +1,5 @@
using System;
using Ryujinx.Common.Logging.Formatters;
using System;
using System.Text.Json.Serialization;
namespace Ryujinx.Common.Logging

15
src/Ryujinx.Common/Logging/Logger.cs
View file

@ -1,3 +1,4 @@
using Ryujinx.Common.Logging.Targets;
using Ryujinx.Common.SystemInterop;
using System;
using System.Collections.Generic;
@ -55,6 +56,16 @@ namespace Ryujinx.Common.Logging
}
}
[StackTraceHidden]
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public void PrintStack(LogClass logClass, string message, [CallerMemberName] string caller = "")
{
if (m_EnabledClasses[(int)logClass])
{
Updated?.Invoke(null, new LogEventArgs(Level, m_Time.Elapsed, Thread.CurrentThread.Name, FormatMessage(logClass, caller, message), new StackTrace(true)));
}
}
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public void PrintStub(LogClass logClass, string message = "", [CallerMemberName] string caller = "")
{
@ -122,7 +133,7 @@ namespace Ryujinx.Common.Logging
AsyncLogTargetOverflowAction.Discard));
Notice = new Log(LogLevel.Notice);
// Enable important log levels before configuration is loaded
Error = new Log(LogLevel.Error);
Warning = new Log(LogLevel.Warning);
@ -221,4 +232,4 @@ namespace Ryujinx.Common.Logging
m_EnabledClasses[(int)logClass] = enabled;
}
}
}
}

2
src/Ryujinx.Common/Logging/Targets/AsyncLogTargetWrapper.cs
View file

@ -2,7 +2,7 @@
using System.Collections.Concurrent;
using System.Threading;
namespace Ryujinx.Common.Logging
namespace Ryujinx.Common.Logging.Targets
{
public enum AsyncLogTargetOverflowAction
{

7
src/Ryujinx.Common/Logging/Targets/ConsoleLogTarget.cs
View file

@ -1,6 +1,7 @@
using System;
using Ryujinx.Common.Logging.Formatters;
using System;
namespace Ryujinx.Common.Logging
namespace Ryujinx.Common.Logging.Targets
{
public class ConsoleLogTarget : ILogTarget
{
@ -38,4 +39,4 @@ namespace Ryujinx.Common.Logging
Console.ResetColor();
}
}
}
}

5
src/Ryujinx.Common/Logging/Targets/FileLogTarget.cs
View file

@ -1,8 +1,9 @@
using System;
using Ryujinx.Common.Logging.Formatters;
using System;
using System.IO;
using System.Linq;
namespace Ryujinx.Common.Logging
namespace Ryujinx.Common.Logging.Targets
{
public class FileLogTarget : ILogTarget
{

2
src/Ryujinx.Common/Logging/Targets/ILogTarget.cs
View file

@ -1,6 +1,6 @@
using System;
namespace Ryujinx.Common.Logging
namespace Ryujinx.Common.Logging.Targets
{
public interface ILogTarget : IDisposable
{

2
src/Ryujinx.Common/Logging/Targets/JsonLogTarget.cs
View file

@ -1,7 +1,7 @@
using Ryujinx.Common.Utilities;
using System.IO;
namespace Ryujinx.Common.Logging
namespace Ryujinx.Common.Logging.Targets
{
public class JsonLogTarget : ILogTarget
{

1
src/Ryujinx.Headless.SDL2/Program.cs
View file

@ -9,6 +9,7 @@ using Ryujinx.Common.Configuration.Hid.Controller;
using Ryujinx.Common.Configuration.Hid.Controller.Motion;
using Ryujinx.Common.Configuration.Hid.Keyboard;
using Ryujinx.Common.Logging;
using Ryujinx.Common.Logging.Targets;
using Ryujinx.Common.SystemInterop;
using Ryujinx.Common.Utilities;
using Ryujinx.Cpu;

1
src/Ryujinx.Ui.Common/Configuration/LoggerModule.cs
View file

@ -1,5 +1,6 @@
using Ryujinx.Common;
using Ryujinx.Common.Logging;
using Ryujinx.Common.Logging.Targets;
using System;
namespace Ryujinx.Ui.Common.Configuration