aboutsummaryrefslogtreecommitdiff
path: root/Ryujinx.Common/Logging/Formatters
diff options
context:
space:
mode:
authorAndrey Sukharev <SukharevAndrey@users.noreply.github.com>2023-04-03 13:14:19 +0300
committerGitHub <noreply@github.com>2023-04-03 10:14:19 +0000
commit3249f8ff41446b47cf458bbc04f8c27e005889aa (patch)
tree72e1087e8b58afe416d66afb6b7a3c4761bef425 /Ryujinx.Common/Logging/Formatters
parent1b41b285ac7f551c3495ced436ce3930ad7223b4 (diff)
Source generated json serializers (#4582)
* Use source generated json serializers in order to improve code trimming * Use strongly typed github releases model to fetch updates instead of raw Newtonsoft.Json parsing * Use separate model for LogEventArgs serialization * Make dynamic object formatter static. Fix string builder pooling. * Do not inherit json version of LogEventArgs from EventArgs * Fix extra space in object formatting * Write log json directly to stream instead of using buffer writer * Rebase fixes * Rebase fixes * Rebase fixes * Enforce block-scoped namespaces in the solution. Convert style for existing code * Apply suggestions from code review Co-authored-by: TSRBerry <20988865+TSRBerry@users.noreply.github.com> * Rebase indent fix * Fix indent * Delete unnecessary json properties * Rebase fix * Remove overridden json property names as they are handled in the options * Apply suggestions from code review Co-authored-by: TSRBerry <20988865+TSRBerry@users.noreply.github.com> * Use default json options in github api calls * Indentation and spacing fixes * Fix json serialization * Fix missing JsonConverter for config enums * Add double \n\n after the whole string, not inside join --------- Co-authored-by: TSRBerry <20988865+TSRBerry@users.noreply.github.com>
Diffstat (limited to 'Ryujinx.Common/Logging/Formatters')
-rw-r--r--Ryujinx.Common/Logging/Formatters/DefaultLogFormatter.cs54
-rw-r--r--Ryujinx.Common/Logging/Formatters/DynamicObjectFormatter.cs84
2 files changed, 92 insertions, 46 deletions
diff --git a/Ryujinx.Common/Logging/Formatters/DefaultLogFormatter.cs b/Ryujinx.Common/Logging/Formatters/DefaultLogFormatter.cs
index b9a08323..28a7d546 100644
--- a/Ryujinx.Common/Logging/Formatters/DefaultLogFormatter.cs
+++ b/Ryujinx.Common/Logging/Formatters/DefaultLogFormatter.cs
@@ -1,22 +1,20 @@
-using System;
-using System.Reflection;
-using System.Text;
+using System.Text;
namespace Ryujinx.Common.Logging
{
internal class DefaultLogFormatter : ILogFormatter
{
- private static readonly ObjectPool<StringBuilder> _stringBuilderPool = SharedPools.Default<StringBuilder>();
+ private static readonly ObjectPool<StringBuilder> StringBuilderPool = SharedPools.Default<StringBuilder>();
public string Format(LogEventArgs args)
{
- StringBuilder sb = _stringBuilderPool.Allocate();
+ StringBuilder sb = StringBuilderPool.Allocate();
try
{
sb.Clear();
- sb.AppendFormat(@"{0:hh\:mm\:ss\.fff}", args.Time);
+ sb.Append($@"{args.Time:hh\:mm\:ss\.fff}");
sb.Append($" |{args.Level.ToString()[0]}| ");
if (args.ThreadName != null)
@@ -27,53 +25,17 @@ namespace Ryujinx.Common.Logging
sb.Append(args.Message);
- if (args.Data != null)
+ if (args.Data is not null)
{
- PropertyInfo[] props = args.Data.GetType().GetProperties();
-
- sb.Append(" {");
-
- foreach (var prop in props)
- {
- sb.Append(prop.Name);
- sb.Append(": ");
-
- if (typeof(Array).IsAssignableFrom(prop.PropertyType))
- {
- Array array = (Array)prop.GetValue(args.Data);
- foreach (var item in array)
- {
- sb.Append(item.ToString());
- sb.Append(", ");
- }
-
- if (array.Length > 0)
- {
- sb.Remove(sb.Length - 2, 2);
- }
- }
- else
- {
- sb.Append(prop.GetValue(args.Data));
- }
-
- sb.Append(" ; ");
- }
-
- // We remove the final ';' from the string
- if (props.Length > 0)
- {
- sb.Remove(sb.Length - 3, 3);
- }
-
- sb.Append('}');
+ sb.Append(' ');
+ DynamicObjectFormatter.Format(sb, args.Data);
}
return sb.ToString();
}
finally
{
- _stringBuilderPool.Release(sb);
+ StringBuilderPool.Release(sb);
}
}
}
diff --git a/Ryujinx.Common/Logging/Formatters/DynamicObjectFormatter.cs b/Ryujinx.Common/Logging/Formatters/DynamicObjectFormatter.cs
new file mode 100644
index 00000000..5f15cc2a
--- /dev/null
+++ b/Ryujinx.Common/Logging/Formatters/DynamicObjectFormatter.cs
@@ -0,0 +1,84 @@
+#nullable enable
+using System;
+using System.Reflection;
+using System.Text;
+
+namespace Ryujinx.Common.Logging
+{
+ internal class DynamicObjectFormatter
+ {
+ private static readonly ObjectPool<StringBuilder> StringBuilderPool = SharedPools.Default<StringBuilder>();
+
+ public static string? Format(object? dynamicObject)
+ {
+ if (dynamicObject is null)
+ {
+ return null;
+ }
+
+ StringBuilder sb = StringBuilderPool.Allocate();
+
+ try
+ {
+ Format(sb, dynamicObject);
+
+ return sb.ToString();
+ }
+ finally
+ {
+ StringBuilderPool.Release(sb);
+ }
+ }
+
+ public static void Format(StringBuilder sb, object? dynamicObject)
+ {
+ if (dynamicObject is null)
+ {
+ return;
+ }
+
+ PropertyInfo[] props = dynamicObject.GetType().GetProperties();
+
+ sb.Append('{');
+
+ foreach (var prop in props)
+ {
+ sb.Append(prop.Name);
+ sb.Append(": ");
+
+ if (typeof(Array).IsAssignableFrom(prop.PropertyType))
+ {
+ Array? array = (Array?) prop.GetValue(dynamicObject);
+
+ if (array is not null)
+ {
+ foreach (var item in array)
+ {
+ sb.Append(item);
+ sb.Append(", ");
+ }
+
+ if (array.Length > 0)
+ {
+ sb.Remove(sb.Length - 2, 2);
+ }
+ }
+ }
+ else
+ {
+ sb.Append(prop.GetValue(dynamicObject));
+ }
+
+ sb.Append(" ; ");
+ }
+
+ // We remove the final ';' from the string
+ if (props.Length > 0)
+ {
+ sb.Remove(sb.Length - 3, 3);
+ }
+
+ sb.Append('}');
+ }
+ }
+} \ No newline at end of file