fix: Correcting the profiler names for named messages vars to be appropriately named. Should address issue #604 (#634)

Author: kvassall-unity

com.unity.multiplayer.mlapi/Editor/MLAPIProfilerModule.cs

@@ -66,6 +66,8 @@ private class MLAPIModules
         {
             new MLAPIProfilerCounter { m_Name = ProfilerConstants.NamedMessageReceived, m_Category = ProfilerCategory.Network.Name },
             new MLAPIProfilerCounter { m_Name = ProfilerConstants.UnnamedMessageReceived, m_Category = ProfilerCategory.Network.Name },
+            new MLAPIProfilerCounter { m_Name = ProfilerConstants.NamedMessageSent, m_Category = ProfilerCategory.Network.Name },
+            new MLAPIProfilerCounter { m_Name = ProfilerConstants.UnnamedMessageSent, m_Category = ProfilerCategory.Network.Name },
             new MLAPIProfilerCounter { m_Name = ProfilerConstants.ByteSent, m_Category = ProfilerCategory.Network.Name },
             new MLAPIProfilerCounter { m_Name = ProfilerConstants.ByteReceived, m_Category = ProfilerCategory.Network.Name },
             new MLAPIProfilerCounter { m_Name = ProfilerConstants.NetworkVarUpdates, m_Category = ProfilerCategory.Network.Name },

com.unity.multiplayer.mlapi/Runtime/Messaging/CustomMessageManager.cs

@@ -5,6 +5,7 @@
 using MLAPI.Serialization;
 using MLAPI.Serialization.Pooled;
 using MLAPI.Hashing;
+using MLAPI.Profiling;
 using MLAPI.Transports;
 
 namespace MLAPI.Messaging
@@ -46,6 +47,7 @@ public static void SendUnnamedMessage(List<ulong> clientIds, NetworkBuffer buffe
             }
 
             InternalMessageSender.Send(NetworkConstants.UNNAMED_MESSAGE, networkChannel, clientIds, buffer);
+            PerformanceDataManager.Increment(ProfilerConstants.UnnamedMessageSent);
         }
 
         /// <summary>
@@ -57,6 +59,7 @@ public static void SendUnnamedMessage(List<ulong> clientIds, NetworkBuffer buffe
         public static void SendUnnamedMessage(ulong clientId, NetworkBuffer buffer, NetworkChannel networkChannel = NetworkChannel.Internal)
         {
             InternalMessageSender.Send(clientId, NetworkConstants.UNNAMED_MESSAGE, networkChannel, buffer);
+            PerformanceDataManager.Increment(ProfilerConstants.UnnamedMessageSent);
         }
 
         #endregion
@@ -173,6 +176,7 @@ public static void SendNamedMessage(string name, ulong clientId, Stream stream,
                 messageBuffer.CopyFrom(stream);
 
                 InternalMessageSender.Send(clientId, NetworkConstants.NAMED_MESSAGE, networkChannel, messageBuffer);
+                PerformanceDataManager.Increment(ProfilerConstants.NamedMessageSent);
             }
         }
 
@@ -213,9 +217,10 @@ public static void SendNamedMessage(string name, List<ulong> clientIds, Stream s
                 }
 
                 InternalMessageSender.Send(NetworkConstants.NAMED_MESSAGE, networkChannel, clientIds, messageBuffer);
+                PerformanceDataManager.Increment(ProfilerConstants.NamedMessageSent);
             }
         }
 
         #endregion
     }
-}
+}

com.unity.multiplayer.mlapi/Runtime/Profiling/ProfilerConstants.cs

@@ -7,6 +7,8 @@ public static class ProfilerConstants
 
         public const string NamedMessageReceived = nameof(NamedMessageReceived);
         public const string UnnamedMessageReceived = nameof(UnnamedMessageReceived);
+        public const string NamedMessageSent = nameof(NamedMessageSent);
+        public const string UnnamedMessageSent = nameof(UnnamedMessageSent);
         public const string ByteSent = nameof(ByteSent);
         public const string ByteReceived = nameof(ByteReceived);
         public const string NetworkVarDeltas = nameof(NetworkVarDeltas);

com.unity.multiplayer.mlapi/Runtime/Profiling/ProfilerCountersInfo.cs

@@ -18,14 +18,22 @@ internal static class ProfilerCountersInfo
                 ProfilerMarkerDataUnit.Count, ProfilerCounterOptions.FlushOnEndOfFrame | ProfilerCounterOptions.ResetToZeroOnFlush);
 
         // Messages
-        private static readonly ProfilerCounterValue<int> k_NamedMessagesCounterValue =
+        private static readonly ProfilerCounterValue<int> k_NamedMessageReceivedCounterValue =
             new ProfilerCounterValue<int>(ProfilerCategory.Network, ProfilerConstants.NamedMessageReceived,
                 ProfilerMarkerDataUnit.Count, ProfilerCounterOptions.FlushOnEndOfFrame | ProfilerCounterOptions.ResetToZeroOnFlush);
 
-        private static readonly ProfilerCounterValue<int> k_UnnamedMessagesCounterValue =
+        private static readonly ProfilerCounterValue<int> k_UnnamedMessageReceivedCounterValue =
             new ProfilerCounterValue<int>(ProfilerCategory.Network, ProfilerConstants.UnnamedMessageReceived,
                 ProfilerMarkerDataUnit.Count, ProfilerCounterOptions.FlushOnEndOfFrame | ProfilerCounterOptions.ResetToZeroOnFlush);
 
+        private static readonly ProfilerCounterValue<int> k_NamedMessageSentCounterValue =
+            new ProfilerCounterValue<int>(ProfilerCategory.Network, ProfilerConstants.NamedMessageSent,
+                ProfilerMarkerDataUnit.Count, ProfilerCounterOptions.FlushOnEndOfFrame | ProfilerCounterOptions.ResetToZeroOnFlush);
+
+        private static readonly ProfilerCounterValue<int> k_UnnamedMessageSentCounterValue =
+            new ProfilerCounterValue<int>(ProfilerCategory.Network, ProfilerConstants.UnnamedMessageSent,
+                ProfilerMarkerDataUnit.Count, ProfilerCounterOptions.FlushOnEndOfFrame | ProfilerCounterOptions.ResetToZeroOnFlush);
+
         private static readonly ProfilerCounterValue<int> k_BytesSentCounterValue =
             new ProfilerCounterValue<int>(ProfilerCategory.Network, ProfilerConstants.ByteSent,
                 ProfilerMarkerDataUnit.Count, ProfilerCounterOptions.FlushOnEndOfFrame | ProfilerCounterOptions.ResetToZeroOnFlush);
@@ -83,8 +91,10 @@ private static void InitializeCounters()
             k_ConnectionsCounterValue.Value = 0;
             k_TickRateCounterValue.Value = 0;
 
-            k_NamedMessagesCounterValue.Value = 0;
-            k_UnnamedMessagesCounterValue.Value = 0;
+            k_NamedMessageReceivedCounterValue.Value = 0;
+            k_UnnamedMessageReceivedCounterValue.Value = 0;
+            k_NamedMessageSentCounterValue.Value = 0;
+            k_UnnamedMessageSentCounterValue.Value = 0;
             k_BytesSentCounterValue.Value = 0;
             k_BytesReceivedCounterValue.Value = 0;
             k_NetworkVarDeltasCounterValue.Value = 0;
@@ -106,8 +116,10 @@ private static void OnPerformanceTickData(PerformanceTickData tickData)
             UpdateIntCounter(tickData, k_TickRateCounterValue, ProfilerConstants.ReceiveTickRate);
 
             // Messages
-            UpdateIntCounter(tickData, k_NamedMessagesCounterValue, ProfilerConstants.NamedMessageReceived);
-            UpdateIntCounter(tickData, k_UnnamedMessagesCounterValue, ProfilerConstants.UnnamedMessageReceived);
+            UpdateIntCounter(tickData, k_NamedMessageReceivedCounterValue, ProfilerConstants.NamedMessageReceived);
+            UpdateIntCounter(tickData, k_UnnamedMessageReceivedCounterValue, ProfilerConstants.UnnamedMessageReceived);
+            UpdateIntCounter(tickData, k_NamedMessageSentCounterValue, ProfilerConstants.NamedMessageSent);
+            UpdateIntCounter(tickData, k_UnnamedMessageSentCounterValue, ProfilerConstants.UnnamedMessageSent);
             UpdateIntCounter(tickData, k_BytesSentCounterValue, ProfilerConstants.ByteSent);
             UpdateIntCounter(tickData, k_BytesReceivedCounterValue, ProfilerConstants.ByteReceived);
             UpdateIntCounter(tickData, k_NetworkVarDeltasCounterValue, ProfilerConstants.NetworkVarDeltas);