fix: delegate as much map processing to another thread unless it's the current map

Author: pandinocoder

Framework/Intersect.Framework.Core/Threading/LockHelper.cs

@@ -1,6 +1,8 @@
+#if DIAGNOSTIC
 using System.Diagnostics;
 using System.Runtime.CompilerServices;
 using Intersect.Logging;
+#endif
 
 namespace Intersect.Threading;
 
@@ -18,24 +20,32 @@ public void Lock(Action work, string? debugInfo = default)
             return;
         }
 
+#if DIAGNOSTIC
         DateTime takenAt = default;
+#endif
 
         try
         {
+#if DIAGNOSTIC
             var waitStartedAt = DateTime.UtcNow;
+#endif
 
             Monitor.Enter(_lock, ref _lockTaken);
 
+#if DIAGNOSTIC
             var waitElapsed = DateTime.UtcNow - waitStartedAt;
 
             DebugPrint($"[{name}] Waited for {waitElapsed.TotalMilliseconds}ms to acquire the lock [{debugInfo}]");
+#endif
 
             if (!_lockTaken)
             {
                 return;
             }
 
+#if DIAGNOSTIC
             _takenAt = takenAt = DateTime.UtcNow;
+#endif
 
             work();
         }
@@ -46,9 +56,11 @@ public void Lock(Action work, string? debugInfo = default)
                 Monitor.Exit(_lock);
                 _lockTaken = false;
 
+#if DIAGNOSTIC
                 var elapsedTaken = DateTime.UtcNow - takenAt;
 
                 DebugPrint($"[{name}] Held lock for {elapsedTaken.TotalMilliseconds}ms [{debugInfo}]");
+#endif
             }
             else
             {
@@ -68,6 +80,7 @@ public bool TryAcquireLock(string? debugInfo, out Reference lockHelperReference)
     {
         bool lockTaken = false;
 
+#if DIAGNOSTIC
         DebugPrint($"TryAcquireLock from: {debugInfo}");
 
         if (_lockTaken)
@@ -76,14 +89,17 @@ public bool TryAcquireLock(string? debugInfo, out Reference lockHelperReference)
         }
 
         var waitStartedAt = DateTime.UtcNow;
+#endif
 
         Monitor.Enter(_lock, ref lockTaken);
 
+#if DIAGNOSTIC
         var waitElapsed = DateTime.UtcNow - waitStartedAt;
 
         DebugPrint($"[{name}] Waited for {waitElapsed.TotalMilliseconds}ms to acquire the lock [{debugInfo}]");
 
         _takenAt = DateTime.UtcNow;
+#endif
 
         if (lockTaken)
         {
@@ -106,17 +122,19 @@ public bool ReleaseLock(string? debugInfo = default)
         Monitor.Exit(_lock);
         _lockTaken = false;
 
+#if DIAGNOSTIC
         var elapsedTaken = DateTime.UtcNow - _takenAt;
 
         DebugPrint($"[{name}] Held lock for {elapsedTaken.TotalMilliseconds}ms [{debugInfo}]");
+#endif
 
         return true;
     }
 
+#if DIAGNOSTIC
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     private static void DebugPrint(string message)
     {
-#if DEBUG
         // if (LegacyLogging.Logger is { } logger)
         // {
         //     logger.Debug(message);
@@ -125,8 +143,8 @@ private static void DebugPrint(string message)
         // {
         //     Console.WriteLine(message);
         // }
-#endif
     }
+#endif
 
     public ref struct Reference(string name, object lockObject, DateTime takenAt, ref bool lockTaken) : IDisposable
     {
@@ -141,9 +159,11 @@ public void Dispose()
 
             Monitor.Exit(lockObject);
 
+#if DIAGNOSTIC
             var elapsedTaken = DateTime.UtcNow - takenAt;
 
             DebugPrint($"[{name}] Held lock for {elapsedTaken.TotalMilliseconds}ms [from ref]");
+#endif
         }
     }
 }

Intersect.Client.Core/Networking/PacketHandler.cs

@@ -316,6 +316,7 @@ internal static void HandleMap(MapPacket packet, bool skipSave = false)
             endGridXYCameraHolds = DateTime.UtcNow;
 
             mapInstance.Autotiles.InitAutotiles(mapInstance.GenerateAutotileGrid());
+
             endInitAutotiles = DateTime.UtcNow;
 
             if (Globals.PendingEvents.TryGetValue(mapId, out var pendingEventsForMap))
@@ -375,8 +376,23 @@ internal static void HandleMap(MapPacket packet, bool skipSave = false)
     //MapPacket
     public void HandlePacket(IPacketSender packetSender, MapPacket packet)
     {
-        HandleMap(packet);
-        Player.FetchNewMaps();
+        if (Globals.Me?.MapInstance is {} currentMap)
+        {
+            if (currentMap.Id != packet.MapId)
+            {
+                Task.Run(DoHandleMap);
+                return;
+            }
+        }
+
+        DoHandleMap();
+        return;
+
+        void DoHandleMap()
+        {
+            HandleMap(packet);
+            Player.FetchNewMaps();
+        }
     }
 
     //PlayerEntityPacket

Intersect.Client.Core/Networking/PacketSender.cs

@@ -98,10 +98,15 @@ public static void SendNeedMap(params Guid[] mapIds)
 
         SendNeedMap(cacheKeys.ToArray());
 
-        foreach (var cachedMap in loadedCachedMaps)
-        {
-            PacketHandler.HandleMap(cachedMap, skipSave: true);
-        }
+        Task.Run(
+            () =>
+            {
+                foreach (var cachedMap in loadedCachedMaps)
+                {
+                    PacketHandler.HandleMap(cachedMap, skipSave: true);
+                }
+            }
+        );
     }
 
     // public static void SendNeedMap(params Guid[] mapIds)