Removed RemoveAll LINQ calls to avoid delegate allocation

TwoTenPvP · TwoTenPvP · commit 5af6ea50f0c5 · 2018-07-26T17:03:51.000+02:00
diff --git a/MLAPI/GlobalSuppressions.cs b/MLAPI/GlobalSuppressions.cs
@@ -27,3 +27,12 @@
 [assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Style", "IDE0018:Inline variable declaration", Justification = "Not supported in Unity Mono version", Scope = "member", Target = "~M:MLAPI.NetworkingManagerComponents.Core.InternalMessageHandler.Send(System.String,System.String,System.Byte[],System.Nullable{System.UInt32},System.Nullable{System.UInt16})")]
 [assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Style", "IDE0018:Inline variable declaration", Justification = "Not supported in Unity Mono version", Scope = "member", Target = "~M:MLAPI.NetworkingManagerComponents.Core.InternalMessageHandler.Send(System.String,System.String,System.Byte[],System.UInt32,System.Nullable{System.UInt32},System.Nullable{System.UInt16})")]
 [assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Style", "IDE0018:Inline variable declaration", Justification = "Not supported in Unity Mono version", Scope = "member", Target = "~M:MLAPI.NetworkingManagerComponents.Core.InternalMessageHandler.Send(System.UInt32[],System.String,System.String,System.Byte[],System.Nullable{System.UInt32},System.Nullable{System.UInt16})")]
+[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Performance", "HAA0202:Value type to reference type conversion allocation for string concatenation", Justification = "Log Message", Scope = "member", Target = "~M:MLAPI.NetworkingManager.Update")]
+[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Performance", "HAA0601:Value type to reference type conversion causing boxing allocation", Justification = "Log Message", Scope = "member", Target = "~M:MLAPI.NetworkingManager.Update")]
+[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Performance", "HAA0202:Value type to reference type conversion allocation for string concatenation", Justification = "Log Message", Scope = "member", Target = "~M:MLAPI.NetworkingManager.ApprovalTimeout(System.UInt32)~System.Collections.IEnumerator")]
+[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Performance", "HAA0202:Value type to reference type conversion allocation for string concatenation", Justification = "Log Message", Scope = "member", Target = "~M:MLAPI.NetworkingManager.HandleIncomingData(System.UInt32,System.Byte[],System.Int32,System.Int32)")]
+[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Performance", "HAA0302:Display class allocation to capture closure", Justification = "Creates duplication, it's not a commonly called function", Scope = "member", Target = "~M:MLAPI.NetworkingManager.DisconnectClient(System.UInt32)")]
+[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Performance", "HAA0603:Delegate allocation from a method group", Justification = "No function pointers", Scope = "member", Target = "~M:MLAPI.Internal.InternalMessageHandler.HandleConnectionRequest(System.UInt32,System.IO.Stream,System.Int32)")]
+[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Performance", "HAA0202:Value type to reference type conversion allocation for string concatenation", Justification = "Log Message", Scope = "member", Target = "~M:MLAPI.Internal.InternalMessageHandler.HandleNetworkedVarDelta(System.UInt32,System.IO.Stream,System.Int32)")]
+[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Performance", "HAA0202:Value type to reference type conversion allocation for string concatenation", Justification = "Log Message", Scope = "member", Target = "~M:MLAPI.Internal.InternalMessageHandler.HandleNetworkedVarUpdate(System.UInt32,System.IO.Stream,System.Int32)")]
+
diff --git a/MLAPI/MonoBehaviours/Core/NetworkedBehaviour.cs b/MLAPI/MonoBehaviours/Core/NetworkedBehaviour.cs
@@ -421,7 +421,7 @@ private void CacheAttributes()
                     ulong hash = HashMethodName(methods[i].Name);
                     if (HashResults.ContainsKey(hash) && HashResults[hash] != methods[i].Name)
                     {
-                        if (LogHelper.CurrentLogLevel <= LogLevel.Error) LogHelper.LogError("Hash collision detected for RPC method. The method \"" + methods[i].Name + "\" collides with the method \"" + HashResults[hash] + "\". This can be solved by increasing the amount of bytes to use for hashing in the NetworkConfig or changing the name of one of the conflicting methods.");
+                        if (LogHelper.CurrentLogLevel <= LogLevel.Error) LogHelper.LogError($"Hash collision detected for RPC method. The method \"{methods[i].Name}\" collides with the method \"{HashResults[hash]}\". This can be solved by increasing the amount of bytes to use for hashing in the NetworkConfig or changing the name of one of the conflicting methods.");
                     }
                     else if (!HashResults.ContainsKey(hash))
                     {
@@ -453,7 +453,7 @@ private void CacheAttributes()
                     ulong hash = HashMethodName(methods[i].Name);
                     if (HashResults.ContainsKey(hash) && HashResults[hash] != methods[i].Name)
                     {
-                        if (LogHelper.CurrentLogLevel <= LogLevel.Error) LogHelper.LogError("Hash collision detected for RPC method. The method \"" + methods[i].Name + "\" collides with the method \"" + HashResults[hash] + "\". This can be solved by increasing the amount of bytes to use for hashing in the NetworkConfig or changing the name of one of the conflicting methods.");
+                        if (LogHelper.CurrentLogLevel <= LogLevel.Error) LogHelper.LogError($"Hash collision detected for RPC method. The method \"{methods[i].Name}\" collides with the method \"{HashResults[hash]}\". This can be solved by increasing the amount of bytes to use for hashing in the NetworkConfig or changing the name of one of the conflicting methods.");
                     }
                     else if (!HashResults.ContainsKey(hash))
                     {
@@ -774,7 +774,9 @@ internal void SendClientRPCPerformance(ulong hash, uint clientId, Stream message
         #endregion
 
         #region SEND METHODS
+        #pragma warning disable HAA0101 // Array allocation for params parameter
         #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
+        #pragma warning disable HAA0601 // Value type to reference type conversion causing boxing allocation
         /// <exclude />
         public delegate void Action();
         /// <exclude />
@@ -2775,6 +2777,9 @@ public void InvokeServerRpc<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T
 			SendServerRPCBoxed(HashMethodName(methodName), t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, t12, t13, t14, t15, t16, t17, t18, t19, t20, t21, t22, t23, t24, t25, t26, t27, t28, t29, t30, t31, t32);
 		}
 
+        #pragma warning restore HAA0101 // Array allocation for params parameter
+        #pragma warning restore HAA0601 // Value type to reference type conversion causing boxing allocation
+
         //PERFORMANCE SERVER RPC
         public void InvokeServerRpc(RpcDelegate method, Stream stream)
         {
diff --git a/MLAPI/MonoBehaviours/Core/NetworkingManager.cs b/MLAPI/MonoBehaviours/Core/NetworkingManager.cs
@@ -18,6 +18,7 @@
 using MLAPI.Transports;
 using MLAPI.Transports.UNET;
 using BitStream = MLAPI.Serialization.BitStream;
+using System.Runtime.CompilerServices;
 
 namespace MLAPI
 {
@@ -691,7 +692,7 @@ private void Update()
                                 NetworkProfiler.EndEvent();
                                 break;
                             case NetEventType.Data:
-                                if (LogHelper.CurrentLogLevel <= LogLevel.Developer) LogHelper.LogInfo("Incomming Data From " + clientId + " : " + receivedSize + " bytes");
+                                if (LogHelper.CurrentLogLevel <= LogLevel.Developer) LogHelper.LogInfo($"Incomming Data From {clientId} : {receivedSize} bytes");
 
                                 HandleIncomingData(clientId, messageBuffer, channelId, receivedSize);
                                 break;
@@ -846,6 +847,9 @@ private void HandleIncomingData(uint clientId, byte[] data, int channelId, int t
             }
         }
 
+#if NET45
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+#endif
         internal void DisconnectClient(uint clientId)
         {
             if (!isServer)
@@ -856,8 +860,12 @@ internal void DisconnectClient(uint clientId)
 
             if (ConnectedClients.ContainsKey(clientId))
                 ConnectedClients.Remove(clientId);
-      
-            ConnectedClientsList.RemoveAll(x => x.ClientId == clientId); // :(
+
+            for (int i = ConnectedClientsList.Count - 1; i > -1; i--)
+            {
+                if (ConnectedClientsList[i].ClientId == clientId)
+                    ConnectedClientsList.RemoveAt(i);
+            }
 
 #if !DISABLE_CRYPTOGRAPHY
             if (diffieHellmanPublicKeys.ContainsKey(clientId))
@@ -883,7 +891,15 @@ internal void OnClientDisconnectFromServer(uint clientId)
                             Destroy(ConnectedClients[clientId].OwnedObjects[i].gameObject);
                     }
                 }
-                ConnectedClientsList.RemoveAll(x => x.ClientId == clientId);
+
+                for (int i = 0; i < ConnectedClientsList.Count; i++)
+                {
+                    if (ConnectedClientsList[i].ClientId == clientId)
+                    {
+                        ConnectedClientsList.RemoveAt(i);
+                        break;
+                    }
+                }
                 ConnectedClients.Remove(clientId);
             }
 
diff --git a/MLAPI/NetworkingManagerComponents/Core/SpawnManager.cs b/MLAPI/NetworkingManagerComponents/Core/SpawnManager.cs
@@ -67,7 +67,11 @@ internal static void RemoveOwnership(uint netId)
                 return;
             }
             NetworkedObject netObject = SpawnManager.SpawnedObjects[netId];
-            NetworkingManager.singleton.ConnectedClients[netObject.OwnerClientId].OwnedObjects.RemoveAll(x => x.NetworkId == netId);
+            for (int i = NetworkingManager.singleton.ConnectedClients[netObject.OwnerClientId].OwnedObjects.Count - 1; i > -1; i--)
+            {
+                if (NetworkingManager.singleton.ConnectedClients[netObject.OwnerClientId].OwnedObjects[i].NetworkId == netId)
+                    NetworkingManager.singleton.ConnectedClients[netObject.OwnerClientId].OwnedObjects.RemoveAt(i);
+            }
 			netObject.OwnerClientId = NetworkingManager.singleton.ServerClientId;
 
             using (PooledBitStream stream = PooledBitStream.Get())
@@ -88,7 +92,11 @@ internal static void ChangeOwnership(uint netId, uint clientId)
                 return;
             }
             NetworkedObject netObject = SpawnManager.SpawnedObjects[netId];
-            NetworkingManager.singleton.ConnectedClients[netObject.OwnerClientId].OwnedObjects.RemoveAll(x => x.NetworkId == netId);
+            for (int i = NetworkingManager.singleton.ConnectedClients[netObject.OwnerClientId].OwnedObjects.Count - 1; i > -1; i--)
+            {
+                if (NetworkingManager.singleton.ConnectedClients[netObject.OwnerClientId].OwnedObjects[i].NetworkId == netId)
+                    NetworkingManager.singleton.ConnectedClients[netObject.OwnerClientId].OwnedObjects.RemoveAt(i);
+            }
             NetworkingManager.singleton.ConnectedClients[clientId].OwnedObjects.Add(netObject);
             netObject.OwnerClientId = clientId;
 
@@ -342,7 +350,11 @@ internal static void OnDestroyObject(uint networkId, bool destroyGameObject)
 			    netManager.ConnectedClients.ContainsKey(SpawnedObjects[networkId].OwnerClientId))
             {
                 //Someone owns it.
-                netManager.ConnectedClients[SpawnedObjects[networkId].OwnerClientId].OwnedObjects.RemoveAll(x => x.NetworkId == networkId);
+                for (int i = NetworkingManager.singleton.ConnectedClients[SpawnedObjects[networkId].OwnerClientId].OwnedObjects.Count - 1; i > -1; i--)
+                {
+                    if (NetworkingManager.singleton.ConnectedClients[SpawnedObjects[networkId].OwnerClientId].OwnedObjects[i].NetworkId == networkId)
+                        NetworkingManager.singleton.ConnectedClients[SpawnedObjects[networkId].OwnerClientId].OwnedObjects.RemoveAt(i);
+                }
             }
             SpawnedObjects[networkId].isSpawned = false;
 
@@ -365,7 +377,11 @@ internal static void OnDestroyObject(uint networkId, bool destroyGameObject)
             if (destroyGameObject && go != null)
                 MonoBehaviour.Destroy(go);
             SpawnedObjects.Remove(networkId);
-            SpawnedObjectsList.RemoveAll(x => x.NetworkId == networkId);
+            for (int i = SpawnedObjectsList.Count - 1; i > -1; i--)
+            {
+                if (SpawnedObjectsList[i].NetworkId == networkId)
+                    SpawnedObjectsList.RemoveAt(i);
+            }
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -421,7 +421,7 @@ private void CacheAttributes()`
`421`	`421`	`ulong hash = HashMethodName(methods[i].Name);`
`422`	`422`	`if (HashResults.ContainsKey(hash) && HashResults[hash] != methods[i].Name)`
`423`	`423`	`{`
`424`		`- if (LogHelper.CurrentLogLevel <= LogLevel.Error) LogHelper.LogError("Hash collision detected for RPC method. The method \"" + methods[i].Name + "\" collides with the method \"" + HashResults[hash] + "\". This can be solved by increasing the amount of bytes to use for hashing in the NetworkConfig or changing the name of one of the conflicting methods.");`
	`424`	`+ if (LogHelper.CurrentLogLevel <= LogLevel.Error) LogHelper.LogError($"Hash collision detected for RPC method. The method \"{methods[i].Name}\" collides with the method \"{HashResults[hash]}\". This can be solved by increasing the amount of bytes to use for hashing in the NetworkConfig or changing the name of one of the conflicting methods.");`
`425`	`425`	`}`
`426`	`426`	`else if (!HashResults.ContainsKey(hash))`
`427`	`427`	`{`
`@@ -453,7 +453,7 @@ private void CacheAttributes()`
`453`	`453`	`ulong hash = HashMethodName(methods[i].Name);`
`454`	`454`	`if (HashResults.ContainsKey(hash) && HashResults[hash] != methods[i].Name)`
`455`	`455`	`{`
`456`		`- if (LogHelper.CurrentLogLevel <= LogLevel.Error) LogHelper.LogError("Hash collision detected for RPC method. The method \"" + methods[i].Name + "\" collides with the method \"" + HashResults[hash] + "\". This can be solved by increasing the amount of bytes to use for hashing in the NetworkConfig or changing the name of one of the conflicting methods.");`
	`456`	`+ if (LogHelper.CurrentLogLevel <= LogLevel.Error) LogHelper.LogError($"Hash collision detected for RPC method. The method \"{methods[i].Name}\" collides with the method \"{HashResults[hash]}\". This can be solved by increasing the amount of bytes to use for hashing in the NetworkConfig or changing the name of one of the conflicting methods.");`
`457`	`457`	`}`
`458`	`458`	`else if (!HashResults.ContainsKey(hash))`
`459`	`459`	`{`
`@@ -774,7 +774,9 @@ internal void SendClientRPCPerformance(ulong hash, uint clientId, Stream message`
`774`	`774`	`#endregion`
`775`	`775`
`776`	`776`	`#region SEND METHODS`
	`777`	`+ #pragma warning disable HAA0101 // Array allocation for params parameter`
`777`	`778`	`#pragma warning disable CS1591 // Missing XML comment for publicly visible type or member`
	`779`	`+ #pragma warning disable HAA0601 // Value type to reference type conversion causing boxing allocation`
`778`	`780`	`/// <exclude />`
`779`	`781`	`public delegate void Action();`
`780`	`782`	`/// <exclude />`
`@@ -2775,6 +2777,9 @@ public void InvokeServerRpc<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T`
`2775`	`2777`	`SendServerRPCBoxed(HashMethodName(methodName), t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, t12, t13, t14, t15, t16, t17, t18, t19, t20, t21, t22, t23, t24, t25, t26, t27, t28, t29, t30, t31, t32);`
`2776`	`2778`	`}`
`2777`	`2779`
	`2780`	`+ #pragma warning restore HAA0101 // Array allocation for params parameter`
	`2781`	`+ #pragma warning restore HAA0601 // Value type to reference type conversion causing boxing allocation`
	`2782`	`+`
`2778`	`2783`	`//PERFORMANCE SERVER RPC`
`2779`	`2784`	`public void InvokeServerRpc(RpcDelegate method, Stream stream)`
`2780`	`2785`	`{`