N-archive/Ryujinx
1
0
Fork 0
mirror of https://github.com/Ryujinx/Ryujinx.git synced 2024-07-02 07:49:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add internal Logging support

Browse source 
Add class Logging.
Replace all Console.WriteLine() to looks better.
Add informations inside Windows Titles.
This commit is contained in:
AcK77 2018-02-09 00:57:23 +01:00
parent 4e2f178a4e
commit 275d363aaf
7 changed files with 147 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
GLScreen.cs
View file

@ -341,7 +341,9 @@ void main(void) {
protected override void OnRenderFrame(FrameEventArgs e)
{
GL.Viewport(0, 0, 1280, 720);
Title = $"Ryujinx Screen - (Vsync: {VSync} - FPS: {1f / e.Time:0})";
GL.Clear(ClearBufferMask.ColorBufferBit | ClearBufferMask.DepthBufferBit);
RenderFb();

13
Program.cs
View file

@ -9,6 +9,8 @@ namespace Ryujinx
{
static void Main(string[] args)
{
Console.Title = "RyujiNX";
IGalRenderer Renderer = new OpenGLRenderer();
Switch Ns = new Switch(Renderer);
@ -21,27 +23,30 @@ namespace Ryujinx
if (RomFsFiles.Length > 0)
{
Console.WriteLine("Loading as cart with RomFS.");
Logging.Info("Loading as cart with RomFS.");
Console.Title += " - Cart (with RomFS) - " + args[0];
Ns.Os.LoadCart(args[0], RomFsFiles[0]);
}
else
{
Console.WriteLine("Loading as cart WITHOUT RomFS.");
Logging.Info("Loading as cart WITHOUT RomFS.");
Console.Title += " - Cart (without RomFS) - " + args[0];
Ns.Os.LoadCart(args[0]);
}
}
else if (File.Exists(args[0]))
{
Console.WriteLine("Loading as homebrew.");
Logging.Info("Loading as homebrew.");
Console.Title += " - Homebrew - " + args[0];
Ns.Os.LoadProgram(args[0]);
}
}
else
{
Console.WriteLine("Please specify the folder with the NSOs/IStorage or a NSO/NRO.");
Logging.Error("Please specify the folder with the NSOs/IStorage or a NSO/NRO.");
}
using (GLScreen Screen = new GLScreen(Ns, Renderer))

5
Ryujinx/Cpu/Memory/AMemoryMgr.cs
View file

@ -1,5 +1,6 @@
using ChocolArm64.Exceptions;
using System;
using Ryujinx;
using System.Runtime.CompilerServices;
namespace ChocolArm64.Memory
@ -261,7 +262,7 @@ namespace ChocolArm64.Memory
{
if (Position < 0x08000000)
{
Console.WriteLine($"HACK: Ignoring bad access at {Position:x16}");
Logging.Warn($"HACK: Ignoring bad access at {Position:x16}");
return 0;
}

128
Ryujinx/Logging.cs Normal file
View file

@ -0,0 +1,128 @@
using System;
using System.Diagnostics;
using System.IO;
using System.Text;
namespace Ryujinx
{
public static class Logging
{
private static Stopwatch ExecutionTime = new Stopwatch();
private static string LogFileName = "Ryujinx.log";
public static bool EnableInfo = true;
public static bool EnableTrace = true;
public static bool EnableDebug = true;
public static bool EnableWarn = true;
public static bool EnableError = true;
public static bool EnableFatal = true;
public static bool EnableLogFile = false;
static Logging()
{
ExecutionTime.Start();
if (File.Exists(LogFileName)) File.Delete(LogFileName);
}
public static string GetExecutionTime()
{
return ExecutionTime.ElapsedMilliseconds.ToString().PadLeft(8, '0') + "ms";
}
private static void LogFile(string Message)
{
if (EnableLogFile)
{
using (StreamWriter Writer = File.AppendText(LogFileName))
{
Writer.WriteLine(Message);
}
}
}
public static void Info(string Message)
{
if (EnableInfo)
{
string Text = $"{GetExecutionTime()} | INFO > {Message}";
Console.ForegroundColor = ConsoleColor.White;
Console.WriteLine(Text.PadLeft(Text.Length + 1, ' '));
Console.ResetColor();
LogFile(Text);
}
}
public static void Trace(string Message)
{
if (EnableTrace)
{
string Text = $"{GetExecutionTime()} | TRACE > {Message}";
Console.ForegroundColor = ConsoleColor.DarkGray;
Console.WriteLine(Text.PadLeft(Text.Length + 1, ' '));
Console.ResetColor();
LogFile(Text);
}
}
public static void Debug(string Message)
{
if (EnableDebug)
{
string Text = $"{GetExecutionTime()} | DEBUG > {Message}";
Console.ForegroundColor = ConsoleColor.Gray;
Console.WriteLine(Text.PadLeft(Text.Length + 1, ' '));
Console.ResetColor();
LogFile(Text);
}
}
public static void Warn(string Message)
{
if (EnableWarn)
{
string Text = $"{GetExecutionTime()} | WARN > {Message}";
Console.ForegroundColor = ConsoleColor.Yellow;
Console.WriteLine(Text.PadLeft(Text.Length + 1, ' '));
Console.ResetColor();
LogFile(Text);
}
}
public static void Error(string Message)
{
if (EnableError)
{
string Text = $"{GetExecutionTime()} | ERROR > {Message}";
Console.ForegroundColor = ConsoleColor.Red;
Console.WriteLine(Text.PadLeft(Text.Length + 1, ' '));
Console.ResetColor();
LogFile(Text);
}
}
public static void Fatal(string Message)
{
if (EnableFatal)
{
string Text = $"{GetExecutionTime()} | FATAL > {Message}";
Console.ForegroundColor = ConsoleColor.Magenta;
Console.WriteLine(Text.PadLeft(Text.Length + 1, ' '));
Console.ResetColor();
LogFile(Text);
}
}
}
}

2
Ryujinx/OsHle/Ipc/IpcHandler.cs
View file

@ -262,6 +262,8 @@ namespace Ryujinx.OsHle.Ipc
}
}
Logging.Debug($"IpcMessage: {DbgServiceName}");
if (ProcReq != null)
{
using (MemoryStream ResMS = new MemoryStream())

2
Ryujinx/OsHle/Services/ServiceNvDrv.cs
View file

@ -563,7 +563,7 @@ namespace Ryujinx.OsHle.Services
NvMap.Kind = Kind;
}
Console.WriteLine($"NvMapIocAlloc at {NvMap.Address:x16}");
Logging.Info($"NvMapIocAlloc at {NvMap.Address:x16}");
return 0;
}

2
Ryujinx/OsHle/Svc/SvcSystem.cs
View file

@ -121,7 +121,7 @@ namespace Ryujinx.OsHle.Svc
string Str = AMemoryHelper.ReadAsciiString(Memory, Position, (int)Size);
Console.WriteLine($"SvcOutputDebugString: {Str}");
Logging.Info($"SvcOutputDebugString: {Str}");
Registers.X0 = (int)SvcResult.Success;
}