Syntriax/Syntriax.Engine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: Syntriax:c8bb991865c8efc99786a9a10767f08ce7b8709c
Branches Tags
Syntriax:main Syntriax:development Syntriax:tests Syntriax:perf/event-memory-allocations Syntriax:net8
...
compare: Syntriax:83b155fc5e8fd1892278876cb90e10dcb64e2154
Branches Tags
Syntriax:development Syntriax:tests Syntriax:main Syntriax:perf/event-memory-allocations Syntriax:net8

5 Commits
c8bb991865 ... 83b155fc5e

Author SHA1 Message Date
Syntriax
83b155fc5e feat: trace log level added 2025-07-12 18:31:35 +03:00
Syntriax
7db56e7f3e refactor: moved event log calls to a shared method 2025-07-12 17:34:56 +03:00
Syntriax
42064875a0 chore: added extra line for LoggerExtensions.LogException for better clarity 2025-07-12 17:34:23 +03:00
Syntriax
41245c0c1c refactor: added class restriction to generic type for event senders 2025-07-12 17:05:18 +03:00
Syntriax
0e5cc8f898 feat: added loggers to event classes 2025-07-12 16:53:12 +03:00
4 changed files with 42 additions and 13 deletions
Expand all files Collapse all files

1
Engine.Core/Debug/ILogger.cs
View File

@@ -8,6 +8,7 @@ public interface ILogger
enum Level
{
Trace,
Info,
Warning,
Error,

2
Engine.Core/Debug/LoggerBase.cs
View File

@@ -4,7 +4,7 @@ namespace Syntriax.Engine.Core.Debug;
public abstract class LoggerBase : ILogger
{
public ILogger.Level FilterLevel { get; set; } = ILogger.Level.Info;
public ILogger.Level FilterLevel { get; set; } = ILogger.Level.Trace;
public void Log(string message, ILogger.Level level = ILogger.Level.Info, bool force = false)
{

12
Engine.Core/Debug/LoggerExtensions.cs
View File

@@ -16,13 +16,21 @@ public static class LoggerExtensions
public static void LogError<T>(this ILogger logger, T caller, string message, bool force = false)
{
Log(logger, caller, message, ILogger.Level.Error, force);
Log(logger, caller, $"{nameof(StackTrace)}:{Environment.NewLine}{new StackTrace()}");
LogTrace(logger, caller, new StackTrace(), force);
}
public static void LogException<T>(this ILogger logger, T caller, Exception exception, bool force = false)
{
Log(logger, caller, $"Exception of type {exception.GetType().Name} occured", ILogger.Level.Error, force);
Log(logger, caller, $"Message: {exception.Message}", ILogger.Level.Error, force);
Log(logger, caller, $"InnerException: {exception.InnerException}", ILogger.Level.Error, force);
Log(logger, caller, $"{nameof(StackTrace)}:{Environment.NewLine}{exception.StackTrace}");
// Not using LogTrace because exception.StackTrace is a type of string
Log(logger, caller, $"{nameof(StackTrace)}:{Environment.NewLine}{exception.StackTrace}", ILogger.Level.Trace);
}
public static void LogTrace<T>(this ILogger logger, T caller, StackTrace stackTrace, bool force = false)
{
Log(logger, caller, $"{nameof(StackTrace)}:{Environment.NewLine}{stackTrace ?? new()}", ILogger.Level.Trace, force);
}
}

40
Engine.Core/Helpers/Event.cs
View File

@@ -1,6 +1,8 @@
using System;
using System.Collections.Generic;
using Syntriax.Engine.Core.Debug;
namespace Syntriax.Engine.Core;
/// <summary>
@@ -48,6 +50,9 @@ public class Event
// We use Ascending order because draw calls are running from last to first
private static readonly Comparer<ListenerData> SortByAscendingPriority = Comparer<ListenerData>.Create((x, y) => x.Priority.CompareTo(y.Priority));
private ILogger _logger = new ConsoleLogger();
public ILogger Logger { get => _logger; set => _logger = value ?? new ConsoleLogger(); }
private readonly List<ListenerData> listeners = null!;
private readonly List<ListenerData> onceListeners = null!;
@@ -126,7 +131,7 @@ public class Event
catch (Exception exception)
{
string methodCallRepresentation = $"{listeners[i].Callback.Method.DeclaringType?.FullName}.{listeners[i].Callback.Method.Name}()";
Console.WriteLine($"Unexpected exception on invocation of method {methodCallRepresentation}:{Environment.NewLine}{exception.InnerException}");
EventHelpers.LogInvocationException(listeners[i].Callback.Target ?? this, Logger, exception, methodCallRepresentation);
}
for (int i = onceListeners.Count - 1; i >= 0; i--)
@@ -135,7 +140,7 @@ public class Event
catch (Exception exception)
{
string methodCallRepresentation = $"{onceListeners[i].Callback.Method.DeclaringType?.FullName}.{onceListeners[i].Callback.Method.Name}()";
Console.WriteLine($"Unexpected exception on invocation of method {methodCallRepresentation}:{Environment.NewLine}{exception.InnerException}");
EventHelpers.LogInvocationException(onceListeners[i].Callback.Target ?? this, Logger, exception, methodCallRepresentation);
}
onceListeners.RemoveAt(i);
}
@@ -199,11 +204,14 @@ public class Event
///
/// </summary>
/// <typeparam name="TSender">Sender type</typeparam>
public class Event<TSender>
public class Event<TSender> where TSender : class
{
// We use Ascending order because draw calls are running from last to first
private static readonly Comparer<ListenerData> SortByAscendingPriority = Comparer<ListenerData>.Create((x, y) => x.Priority.CompareTo(y.Priority));
private ILogger _logger = new ConsoleLogger();
public ILogger Logger { get => _logger; set => _logger = value ?? new ConsoleLogger(); }
private readonly List<ListenerData> listeners = null!;
private readonly List<ListenerData> onceListeners = null!;
@@ -283,7 +291,7 @@ public class Event<TSender>
catch (Exception exception)
{
string methodCallRepresentation = $"{listeners[i].Callback.Method.DeclaringType?.FullName}.{listeners[i].Callback.Method.Name}({sender})";
Console.WriteLine($"Unexpected exception on invocation of method {methodCallRepresentation}:{Environment.NewLine}{exception.InnerException}");
EventHelpers.LogInvocationException(listeners[i].Callback.Target ?? sender, Logger, exception, methodCallRepresentation);
}
for (int i = onceListeners.Count - 1; i >= 0; i--)
@@ -292,7 +300,7 @@ public class Event<TSender>
catch (Exception exception)
{
string methodCallRepresentation = $"{onceListeners[i].Callback.Method.DeclaringType?.FullName}.{onceListeners[i].Callback.Method.Name}({sender})";
Console.WriteLine($"Unexpected exception on invocation of method {methodCallRepresentation}:{Environment.NewLine}{exception.InnerException}");
EventHelpers.LogInvocationException(onceListeners[i].Callback.Target ?? sender, Logger, exception, methodCallRepresentation);
}
onceListeners.RemoveAt(i);
}
@@ -363,11 +371,14 @@ public class Event<TSender>
///
/// </summary>
/// <typeparam name="TSender">Sender type</typeparam>
public class Event<TSender, TArguments>
public class Event<TSender, TArguments> where TSender : class
{
// We use Ascending order because draw calls are running from last to first
private static readonly Comparer<ListenerData> SortByAscendingPriority = Comparer<ListenerData>.Create((x, y) => x.Priority.CompareTo(y.Priority));
private ILogger _logger = new ConsoleLogger();
public ILogger Logger { get => _logger; set => _logger = value ?? new ConsoleLogger(); }
private readonly List<ListenerData> listeners = null!;
private readonly List<ListenerData> onceListeners = null!;
@@ -447,8 +458,8 @@ public class Event<TSender, TArguments>
try { listeners[i].Callback.Invoke(sender, args); }
catch (Exception exception)
{
string methodCallRepresentation = $"{listeners[i].Callback.Method.DeclaringType?.FullName}.{listeners[i].Callback.Method.Name}({string.Join(", ", sender, args)})";
Console.WriteLine($"Unexpected exception on invocation of method {methodCallRepresentation}:{Environment.NewLine}{exception.InnerException}");
string methodCallRepresentation = $"{listeners[i].Callback.Method.DeclaringType?.FullName}.{listeners[i].Callback.Method.Name}({sender}, {args})";
EventHelpers.LogInvocationException(listeners[i].Callback.Target ?? sender, Logger, exception, methodCallRepresentation);
}
for (int i = onceListeners.Count - 1; i >= 0; i--)
@@ -456,8 +467,8 @@ public class Event<TSender, TArguments>
try { onceListeners[i].Callback.Invoke(sender, args); }
catch (Exception exception)
{
string methodCallRepresentation = $"{onceListeners[i].Callback.Method.DeclaringType?.FullName}.{onceListeners[i].Callback.Method.Name}({string.Join(", ", sender, args)})";
Console.WriteLine($"Unexpected exception on invocation of method {methodCallRepresentation}:{Environment.NewLine}{exception.InnerException}");
string methodCallRepresentation = $"{onceListeners[i].Callback.Method.DeclaringType?.FullName}.{onceListeners[i].Callback.Method.Name}({sender}, {args})";
EventHelpers.LogInvocationException(onceListeners[i].Callback.Target ?? sender, Logger, exception, methodCallRepresentation);
}
onceListeners.RemoveAt(i);
}
@@ -478,3 +489,12 @@ public class Event<TSender, TArguments>
public delegate void EventHandler(TSender sender, TArguments args);
private record struct ListenerData(EventHandler Callback, int Priority);
}
internal static class EventHelpers
{
public static void LogInvocationException(object sender, ILogger logger, Exception exception, string methodCallRepresentation)
{
logger.LogException(sender, exception);
logger.LogError(sender, $"Unexpected exception on invocation of method {methodCallRepresentation}");
}
}