From 4ce4299ca2a6b11332f2341c69f40efd7205282f Mon Sep 17 00:00:00 2001
From: Andrey Sukharev <SukharevAndrey@users.noreply.github.com>
Date: Wed, 22 Mar 2023 01:41:19 +0300
Subject: Use source generated json serializers in order to improve code
trimming (#4094)
* 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
---------
Co-authored-by: TSRBerry <20988865+TSRBerry@users.noreply.github.com>
---
.../Logging/Formatters/DefaultLogFormatter.cs | 54 ++++------------------
1 file changed, 8 insertions(+), 46 deletions(-)
(limited to 'Ryujinx.Common/Logging/Formatters/DefaultLogFormatter.cs')
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);
}
}
}
--
cgit v1.2.3-70-g09d2