From e68bd90ffe4405643474df21646aebab64e7c917 Mon Sep 17 00:00:00 2001
From: rootdarkarchon <root.darkarchon@outlook.com>
Date: Thu, 4 May 2023 01:31:21 +0200
Subject: [PATCH] clean up and reduce logging

---
 MareSynchronos/Services/DalamudUtilService.cs | 89 ++++++++++++-------
 1 file changed, 57 insertions(+), 32 deletions(-)

diff --git a/MareSynchronos/Services/DalamudUtilService.cs b/MareSynchronos/Services/DalamudUtilService.cs
index 25dff69..08b7e62 100644
--- a/MareSynchronos/Services/DalamudUtilService.cs
+++ b/MareSynchronos/Services/DalamudUtilService.cs
@@ -31,6 +31,7 @@ public class DalamudUtilService : IHostedService
     private readonly PerformanceCollectorService _performanceCollector;
     private uint? _classJobId = 0;
     private DateTime _delayedFrameworkUpdateCheck = DateTime.Now;
+    private string _lastGlobalBlockPlayer = string.Empty;
     private Dictionary<string, (string Name, nint Address)> _playerCharas = new(StringComparer.Ordinal);
     private bool _sentBetweenAreas = false;
 
@@ -325,6 +326,55 @@ public class DalamudUtilService : IHostedService
         return result;
     }
 
+    private unsafe void CheckCharacterForDrawing(PlayerCharacter p)
+    {
+        if (!IsAnythingDrawing)
+        {
+            var gameObj = (GameObject*)p.Address;
+            var drawObj = gameObj->DrawObject;
+            var playerName = p.Name.ToString();
+            bool isDrawing = false;
+            if ((nint)drawObj != IntPtr.Zero)
+            {
+                isDrawing = gameObj->RenderFlags == 0b100000000000;
+                if (!isDrawing)
+                {
+                    isDrawing = ((CharacterBase*)drawObj)->HasModelInSlotLoaded != 0;
+                    if (!isDrawing)
+                    {
+                        isDrawing = ((CharacterBase*)drawObj)->HasModelFilesInSlotLoaded != 0;
+                        if (isDrawing)
+                        {
+                            if (!string.Equals(_lastGlobalBlockPlayer, playerName, StringComparison.Ordinal))
+                            {
+                                _lastGlobalBlockPlayer = playerName;
+                                _logger.LogTrace("Global draw block: START => {name} (HasModelFilesInSlotLoaded)", playerName);
+                            }
+                        }
+                    }
+                    else
+                    {
+                        if (!string.Equals(_lastGlobalBlockPlayer, playerName, StringComparison.Ordinal))
+                        {
+                            _lastGlobalBlockPlayer = playerName;
+                            _logger.LogTrace("Global draw block: START => {name} (HasModelInSlotLoaded)", playerName);
+                        }
+                    }
+                }
+                else
+                {
+                    if (!string.Equals(_lastGlobalBlockPlayer, playerName, StringComparison.Ordinal))
+                    {
+                        _lastGlobalBlockPlayer = playerName;
+                        _logger.LogTrace("Global draw block: START => {name} (RenderFlags)", playerName);
+                    }
+                }
+            }
+
+            IsAnythingDrawing |= isDrawing;
+        }
+    }
+
     private void FrameworkOnUpdate(Framework framework)
     {
         _performanceCollector.LogPerformance(this, "FrameworkOnUpdate", FrameworkOnUpdateInternal);
@@ -347,41 +397,16 @@ public class DalamudUtilService : IHostedService
             () => _objectTable.OfType<PlayerCharacter>().Where(o => o.ObjectIndex < 240)
                 .ToDictionary(p => p.GetHash256(), p =>
                 {
-                    if (!IsAnythingDrawing)
-                    {
-                        var gameObj = (GameObject*)p.Address;
-                        var drawObj = gameObj->DrawObject;
-                        bool isDrawing = false;
-                        if ((nint)drawObj != IntPtr.Zero)
-                        {
-                            isDrawing = gameObj->RenderFlags == 0b100000000000;
-                            if (!isDrawing)
-                            {
-                                isDrawing = ((CharacterBase*)drawObj)->HasModelInSlotLoaded != 0;
-                                if (!isDrawing)
-                                {
-                                    isDrawing = ((CharacterBase*)drawObj)->HasModelFilesInSlotLoaded != 0;
-                                    if (isDrawing)
-                                    {
-                                        _logger.LogTrace("Global draw block triggered by {name} due to HasModelFilesInSlotLoaded", p.Name.ToString());
-                                    }
-                                }
-                                else
-                                {
-                                    _logger.LogTrace("Global draw block triggered by {name} due to HasModelInSlotLoaded", p.Name.ToString());
-                                }
-                            }
-                            else
-                            {
-                                _logger.LogTrace("Global draw block triggered by {name} due to RenderFlags", p.Name.ToString());
-                            }
-                        }
-
-                        IsAnythingDrawing |= isDrawing;
-                    }
+                    CheckCharacterForDrawing(p);
                     return (p.Name.ToString(), p.Address);
                 }, StringComparer.Ordinal));
 
+        if (!IsAnythingDrawing && !string.IsNullOrEmpty(_lastGlobalBlockPlayer))
+        {
+            _logger.LogTrace("Global draw block: END => {name}", _lastGlobalBlockPlayer);
+            _lastGlobalBlockPlayer = string.Empty;
+        }
+
         if (GposeTarget != null && !IsInGpose)
         {
             _logger.LogDebug("Gpose start");