mirrors/Ryujinx
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Pass the call-sites Thread ID through to the logger

Browse source
This commit is contained in:
jduncanator 2018-12-10 13:26:17 +11:00
commit d964d2184a
3 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Ryujinx.Common/Logging/LogEventArgs.cs
View file

@ -4,15 +4,17 @@ namespace Ryujinx.Common.Logging
{ {
public class LogEventArgs : EventArgs public class LogEventArgs : EventArgs
{ {
public LogLevel Level { get; private set; } public LogLevel Level { get; private set; }
public TimeSpan Time { get; private set; } public TimeSpan Time { get; private set; }
public int ThreadId { get; private set; }
public string Message { get; private set; } public string Message { get; private set; }
public LogEventArgs(LogLevel level, TimeSpan time, string message) public LogEventArgs(LogLevel level, TimeSpan time, int threadId, string message)
{ {
this.Level = level; this.Level = level;
this.Time = time; this.Time = time;
this.ThreadId = threadId;
this.Message = message; this.Message = message;
} }
} }

3
Ryujinx.Common/Logging/Logger.cs
View file

@ -3,6 +3,7 @@ using System.Diagnostics;
using System.Reflection; using System.Reflection;
using System.Runtime.CompilerServices; using System.Runtime.CompilerServices;
using System.Text; using System.Text;
using System.Threading;
namespace Ryujinx.Common.Logging namespace Ryujinx.Common.Logging
{ {
@ -116,7 +117,7 @@ namespace Ryujinx.Common.Logging
{ {
if (m_EnabledLevels[(int)logLevel] && m_EnabledClasses[(int)logClass]) if (m_EnabledLevels[(int)logLevel] && m_EnabledClasses[(int)logClass])
{ {
Updated?.Invoke(null, new LogEventArgs(logLevel, m_Time.Elapsed, message)); Updated?.Invoke(null, new LogEventArgs(logLevel, m_Time.Elapsed, Thread.CurrentThread.ManagedThreadId, message));
} }
} }

2
Ryujinx/Ui/ConsoleLog.cs
View file

@ -57,7 +57,7 @@ namespace Ryujinx
{ {
string formattedTime = e.Time.ToString(@"hh\:mm\:ss\.fff"); string formattedTime = e.Time.ToString(@"hh\:mm\:ss\.fff");
string currentThread = Thread.CurrentThread.ManagedThreadId.ToString("d4"); string currentThread = e.ThreadId.ToString("d4");
string message = formattedTime + " | " + currentThread + " " + e.Message; string message = formattedTime + " | " + currentThread + " " + e.Message;