aboutsummaryrefslogtreecommitdiff
path: root/Ryujinx.HLE/HOS/Services/Lm
diff options
context:
space:
mode:
authorgdkchan <gab.dark.100@gmail.com>2018-08-16 20:47:36 -0300
committerGitHub <noreply@github.com>2018-08-16 20:47:36 -0300
commit521751795a1c97c0d97f6f8904a3be69b13d3a9d (patch)
tree942a05899c40e2de6d92a38b93a494bd96ee64b8 /Ryujinx.HLE/HOS/Services/Lm
parent182d716867ae477c2b15a5332430dc2641fa1cc3 (diff)
Code style fixes and nits on the HLE project (#355)
* Some style fixes and nits on ITimeZoneService * Remove some unneeded usings * Remove the Ryujinx.HLE.OsHle.Handles namespace * Remove hbmenu automatic load on process exit * Rename Ns to Device, rename Os to System, rename SystemState to State * Move Exceptions and Utilities out of OsHle * Rename OsHle to HOS * Rename OsHle folder to HOS * IManagerDisplayService and ISystemDisplayService style fixes * BsdError shouldn't be public * Add a empty new line before using static * Remove unused file * Some style fixes on NPDM * Exit gracefully when the application is closed * Code style fixes on IGeneralService * Add 0x prefix on values printed as hex * Small improvements on finalization code * Move ProcessId and ThreadId out of AThreadState * Rename VFs to FileSystem * FsAccessHeader shouldn't be public. Also fix file names casing * More case changes on NPDM * Remove unused files * Move using to the correct place on NPDM * Use properties on KernelAccessControlMmio * Address PR feedback
Diffstat (limited to 'Ryujinx.HLE/HOS/Services/Lm')
-rw-r--r--Ryujinx.HLE/HOS/Services/Lm/ILogService.cs27
-rw-r--r--Ryujinx.HLE/HOS/Services/Lm/ILogger.cs86
-rw-r--r--Ryujinx.HLE/HOS/Services/Lm/LmLogField.cs13
-rw-r--r--Ryujinx.HLE/HOS/Services/Lm/LmLogLevel.cs11
4 files changed, 137 insertions, 0 deletions
diff --git a/Ryujinx.HLE/HOS/Services/Lm/ILogService.cs b/Ryujinx.HLE/HOS/Services/Lm/ILogService.cs
new file mode 100644
index 00000000..d79da515
--- /dev/null
+++ b/Ryujinx.HLE/HOS/Services/Lm/ILogService.cs
@@ -0,0 +1,27 @@
+using Ryujinx.HLE.HOS.Ipc;
+using System.Collections.Generic;
+
+namespace Ryujinx.HLE.HOS.Services.Lm
+{
+ class ILogService : IpcService
+ {
+ private Dictionary<int, ServiceProcessRequest> m_Commands;
+
+ public override IReadOnlyDictionary<int, ServiceProcessRequest> Commands => m_Commands;
+
+ public ILogService()
+ {
+ m_Commands = new Dictionary<int, ServiceProcessRequest>()
+ {
+ { 0, Initialize }
+ };
+ }
+
+ public long Initialize(ServiceCtx Context)
+ {
+ MakeObject(Context, new ILogger());
+
+ return 0;
+ }
+ }
+} \ No newline at end of file
diff --git a/Ryujinx.HLE/HOS/Services/Lm/ILogger.cs b/Ryujinx.HLE/HOS/Services/Lm/ILogger.cs
new file mode 100644
index 00000000..42d57c6f
--- /dev/null
+++ b/Ryujinx.HLE/HOS/Services/Lm/ILogger.cs
@@ -0,0 +1,86 @@
+using Ryujinx.HLE.HOS.Ipc;
+using Ryujinx.HLE.Logging;
+using System.Collections.Generic;
+using System.IO;
+using System.Text;
+
+namespace Ryujinx.HLE.HOS.Services.Lm
+{
+ class ILogger : IpcService
+ {
+ private Dictionary<int, ServiceProcessRequest> m_Commands;
+
+ public override IReadOnlyDictionary<int, ServiceProcessRequest> Commands => m_Commands;
+
+ public ILogger()
+ {
+ m_Commands = new Dictionary<int, ServiceProcessRequest>()
+ {
+ { 0, Log }
+ };
+ }
+
+ public long Log(ServiceCtx Context)
+ {
+ byte[] LogBuffer = Context.Memory.ReadBytes(
+ Context.Request.PtrBuff[0].Position,
+ Context.Request.PtrBuff[0].Size);
+
+ using (MemoryStream MS = new MemoryStream(LogBuffer))
+ {
+ BinaryReader Reader = new BinaryReader(MS);
+
+ long Pid = Reader.ReadInt64();
+ long ThreadContext = Reader.ReadInt64();
+ short Flags = Reader.ReadInt16();
+ byte Level = Reader.ReadByte();
+ byte Verbosity = Reader.ReadByte();
+ int PayloadLength = Reader.ReadInt32();
+
+ StringBuilder SB = new StringBuilder();
+
+ SB.AppendLine("Guest log:");
+
+ while (MS.Position < MS.Length)
+ {
+ byte Type = Reader.ReadByte();
+ byte Size = Reader.ReadByte();
+
+ LmLogField Field = (LmLogField)Type;
+
+ string FieldStr = string.Empty;
+
+ if (Field == LmLogField.Skip)
+ {
+ Reader.ReadByte();
+
+ continue;
+ }
+ else if (Field == LmLogField.Line)
+ {
+ FieldStr = Field + ": " + Reader.ReadInt32();
+ }
+ else
+ {
+ FieldStr = Field + ": \"" + Encoding.UTF8.GetString(Reader.ReadBytes(Size)) + "\"";
+ }
+
+ SB.AppendLine(" " + FieldStr);
+ }
+
+ string Text = SB.ToString();
+
+ switch((LmLogLevel)Level)
+ {
+ case LmLogLevel.Trace: Context.Device.Log.PrintDebug (LogClass.ServiceLm, Text); break;
+ case LmLogLevel.Info: Context.Device.Log.PrintInfo (LogClass.ServiceLm, Text); break;
+ case LmLogLevel.Warning: Context.Device.Log.PrintWarning(LogClass.ServiceLm, Text); break;
+ case LmLogLevel.Error: Context.Device.Log.PrintError (LogClass.ServiceLm, Text); break;
+ case LmLogLevel.Critical: Context.Device.Log.PrintError (LogClass.ServiceLm, Text); break;
+ }
+ }
+
+ return 0;
+ }
+ }
+}
diff --git a/Ryujinx.HLE/HOS/Services/Lm/LmLogField.cs b/Ryujinx.HLE/HOS/Services/Lm/LmLogField.cs
new file mode 100644
index 00000000..bd8c8e88
--- /dev/null
+++ b/Ryujinx.HLE/HOS/Services/Lm/LmLogField.cs
@@ -0,0 +1,13 @@
+namespace Ryujinx.HLE.HOS.Services.Lm
+{
+ enum LmLogField
+ {
+ Skip = 1,
+ Message = 2,
+ Line = 3,
+ Filename = 4,
+ Function = 5,
+ Module = 6,
+ Thread = 7
+ }
+} \ No newline at end of file
diff --git a/Ryujinx.HLE/HOS/Services/Lm/LmLogLevel.cs b/Ryujinx.HLE/HOS/Services/Lm/LmLogLevel.cs
new file mode 100644
index 00000000..70554c42
--- /dev/null
+++ b/Ryujinx.HLE/HOS/Services/Lm/LmLogLevel.cs
@@ -0,0 +1,11 @@
+namespace Ryujinx.HLE.HOS.Services.Lm
+{
+ enum LmLogLevel
+ {
+ Trace,
+ Info,
+ Warning,
+ Error,
+ Critical
+ }
+} \ No newline at end of file