From 5538d9f144090add0f1e3bf3668375953351daf0 Mon Sep 17 00:00:00 2001 From: Jeffrey Rainy Date: Wed, 2 Jun 2021 13:52:38 -0400 Subject: [PATCH] refactor: Removing dead code for NETWORK_VARIABLE_UPDATE --- .../Runtime/Configuration/NetworkConstants.cs | 3 +- .../Runtime/Core/NetworkManager.cs | 11 ---- .../Messaging/IInternalMessageHandler.cs | 1 - .../Messaging/InternalMessageHandler.cs | 59 ------------------- .../NetworkManagerMessageHandlerTests.cs | 14 ----- 5 files changed, 1 insertion(+), 87 deletions(-) diff --git a/com.unity.multiplayer.mlapi/Runtime/Configuration/NetworkConstants.cs b/com.unity.multiplayer.mlapi/Runtime/Configuration/NetworkConstants.cs index 6afbf53b41..8c1ceac3a9 100644 --- a/com.unity.multiplayer.mlapi/Runtime/Configuration/NetworkConstants.cs +++ b/com.unity.multiplayer.mlapi/Runtime/Configuration/NetworkConstants.cs @@ -17,7 +17,6 @@ internal static class NetworkConstants internal const byte ADD_OBJECTS = 10; internal const byte TIME_SYNC = 11; internal const byte NETWORK_VARIABLE_DELTA = 12; - internal const byte NETWORK_VARIABLE_UPDATE = 13; internal const byte ALL_CLIENTS_LOADED_SCENE = 14; internal const byte UNNAMED_MESSAGE = 20; internal const byte DESTROY_OBJECTS = 21; @@ -43,7 +42,7 @@ internal static class NetworkConstants "ADD_OBJECTS", "TIME_SYNC", "NETWORK_VARIABLE_DELTA", - "NETWORK_VARIABLE_UPDATE", + "", "ALL_CLIENTS_SWITCH_SCENE_COMPLETED", "", "", // 16 diff --git a/com.unity.multiplayer.mlapi/Runtime/Core/NetworkManager.cs b/com.unity.multiplayer.mlapi/Runtime/Core/NetworkManager.cs index 0eac75309d..3a39ab2a32 100644 --- a/com.unity.multiplayer.mlapi/Runtime/Core/NetworkManager.cs +++ b/com.unity.multiplayer.mlapi/Runtime/Core/NetworkManager.cs @@ -1264,17 +1264,6 @@ internal void HandleIncomingData(ulong clientId, NetworkChannel networkChannel, ReceiveTime = receiveTime }); break; - case NetworkConstants.NETWORK_VARIABLE_UPDATE: - MessageHandler.HandleNetworkVariableUpdate(clientId, messageStream, BufferCallback, new PreBufferPreset() - { - AllowBuffer = allowBuffer, - NetworkChannel = networkChannel, - ClientId = clientId, - Data = data, - MessageType = messageType, - ReceiveTime = receiveTime - }); - break; case NetworkConstants.UNNAMED_MESSAGE: MessageHandler.HandleUnnamedMessage(clientId, messageStream); break; diff --git a/com.unity.multiplayer.mlapi/Runtime/Messaging/IInternalMessageHandler.cs b/com.unity.multiplayer.mlapi/Runtime/Messaging/IInternalMessageHandler.cs index 6792386334..ceab9b95f0 100644 --- a/com.unity.multiplayer.mlapi/Runtime/Messaging/IInternalMessageHandler.cs +++ b/com.unity.multiplayer.mlapi/Runtime/Messaging/IInternalMessageHandler.cs @@ -18,7 +18,6 @@ internal interface IInternalMessageHandler void HandleDestroyObjects(ulong clientId, Stream stream); void HandleTimeSync(ulong clientId, Stream stream, float receiveTime); void HandleNetworkVariableDelta(ulong clientId, Stream stream, Action bufferCallback, PreBufferPreset bufferPreset); - void HandleNetworkVariableUpdate(ulong clientId, Stream stream, Action bufferCallback, PreBufferPreset bufferPreset); void RpcReceiveQueueItem(ulong clientId, Stream stream, float receiveTime, RpcQueueContainer.QueueItemType queueItemType); void HandleUnnamedMessage(ulong clientId, Stream stream); void HandleNamedMessage(ulong clientId, Stream stream); diff --git a/com.unity.multiplayer.mlapi/Runtime/Messaging/InternalMessageHandler.cs b/com.unity.multiplayer.mlapi/Runtime/Messaging/InternalMessageHandler.cs index 8dccf5bc95..4fadb1f707 100644 --- a/com.unity.multiplayer.mlapi/Runtime/Messaging/InternalMessageHandler.cs +++ b/com.unity.multiplayer.mlapi/Runtime/Messaging/InternalMessageHandler.cs @@ -31,7 +31,6 @@ internal class InternalMessageHandler : IInternalMessageHandler private static ProfilerMarker s_HandleDestroyObjects = new ProfilerMarker($"{nameof(InternalMessageHandler)}.{nameof(HandleDestroyObjects)}"); private static ProfilerMarker s_HandleTimeSync = new ProfilerMarker($"{nameof(InternalMessageHandler)}.{nameof(HandleTimeSync)}"); private static ProfilerMarker s_HandleNetworkVariableDelta = new ProfilerMarker($"{nameof(InternalMessageHandler)}.{nameof(HandleNetworkVariableDelta)}"); - private static ProfilerMarker s_HandleNetworkVariableUpdate = new ProfilerMarker($"{nameof(InternalMessageHandler)}.{nameof(HandleNetworkVariableUpdate)}"); private static ProfilerMarker s_HandleUnnamedMessage = new ProfilerMarker($"{nameof(InternalMessageHandler)}.{nameof(HandleUnnamedMessage)}"); private static ProfilerMarker s_HandleNamedMessage = new ProfilerMarker($"{nameof(InternalMessageHandler)}.{nameof(HandleNamedMessage)}"); private static ProfilerMarker s_HandleNetworkLog = new ProfilerMarker($"{nameof(InternalMessageHandler)}.{nameof(HandleNetworkLog)}"); @@ -413,64 +412,6 @@ public void HandleNetworkVariableDelta(ulong clientId, Stream stream, Action bufferCallback, PreBufferPreset bufferPreset) - { -#if DEVELOPMENT_BUILD || UNITY_EDITOR - s_HandleNetworkVariableUpdate.Begin(); -#endif - if (!NetworkManager.NetworkConfig.EnableNetworkVariable) - { - if (NetworkLog.CurrentLogLevel <= LogLevel.Normal) - { - NetworkLog.LogWarning($"{nameof(NetworkConstants.NETWORK_VARIABLE_UPDATE)} update received but {nameof(NetworkConfig.EnableNetworkVariable)} is false"); - } - - return; - } - - using (var reader = PooledNetworkReader.Get(stream)) - { - ulong networkObjectId = reader.ReadUInt64Packed(); - ushort networkBehaviourIndex = reader.ReadUInt16Packed(); - - if (NetworkManager.SpawnManager.SpawnedObjects.TryGetValue(networkObjectId, out NetworkObject networkObject)) - { - var networkBehaviour = networkObject.GetNetworkBehaviourAtOrderIndex(networkBehaviourIndex); - - if (networkBehaviour == null) - { - if (NetworkLog.CurrentLogLevel <= LogLevel.Normal) - { - NetworkLog.LogWarning($"{nameof(NetworkConstants.NETWORK_VARIABLE_UPDATE)} message received for a non-existent behaviour. {nameof(networkObjectId)}: {networkObjectId}, {nameof(networkBehaviourIndex)}: {networkBehaviourIndex}"); - } - } - else - { - NetworkBehaviour.HandleNetworkVariableUpdate(networkBehaviour.NetworkVariableFields, stream, clientId, networkBehaviour, NetworkManager); - } - } - else if (NetworkManager.IsServer || !NetworkManager.NetworkConfig.EnableMessageBuffering) - { - if (NetworkLog.CurrentLogLevel <= LogLevel.Normal) - { - NetworkLog.LogWarning($"{nameof(NetworkConstants.NETWORK_VARIABLE_UPDATE)} message received for a non-existent object with {nameof(networkObjectId)}: {networkObjectId}. This delta was lost."); - } - } - else - { - if (NetworkLog.CurrentLogLevel <= LogLevel.Normal) - { - NetworkLog.LogWarning($"{nameof(NetworkConstants.NETWORK_VARIABLE_UPDATE)} message received for a non-existent object with {nameof(networkObjectId)}: {networkObjectId}. This delta will be buffered and might be recovered."); - } - - bufferCallback(networkObjectId, bufferPreset); - } - } -#if DEVELOPMENT_BUILD || UNITY_EDITOR - s_HandleNetworkVariableUpdate.End(); -#endif - } - /// /// Converts the stream to a PerformanceQueueItem and adds it to the receive queue /// diff --git a/com.unity.multiplayer.mlapi/Tests/Editor/NetworkManagerMessageHandlerTests.cs b/com.unity.multiplayer.mlapi/Tests/Editor/NetworkManagerMessageHandlerTests.cs index 96759aefa3..67a17917f9 100644 --- a/com.unity.multiplayer.mlapi/Tests/Editor/NetworkManagerMessageHandlerTests.cs +++ b/com.unity.multiplayer.mlapi/Tests/Editor/NetworkManagerMessageHandlerTests.cs @@ -111,13 +111,6 @@ public void MessageHandlerReceivedMessageServerClient() networkManager.HandleIncomingData(0, NetworkChannel.Internal, new ArraySegment(messageStream.GetBuffer(), 0, (int)messageStream.Length), 0, true); } - // Should cause log (server and client) - LogAssert.Expect(LogType.Log, nameof(MessageHandlerReceivedMessageServerClient) + " " + nameof(DummyMessageHandler.HandleNetworkVariableUpdate)); - using (var messageStream = MessagePacker.WrapMessage(NetworkConstants.NETWORK_VARIABLE_UPDATE, inputBuffer)) - { - networkManager.HandleIncomingData(0, NetworkChannel.Internal, new ArraySegment(messageStream.GetBuffer(), 0, (int)messageStream.Length), 0, true); - } - // Should cause log (server and client) LogAssert.Expect(LogType.Log, nameof(MessageHandlerReceivedMessageServerClient) + " " + nameof(DummyMessageHandler.HandleUnnamedMessage)); using (var messageStream = MessagePacker.WrapMessage(NetworkConstants.UNNAMED_MESSAGE, inputBuffer)) @@ -241,13 +234,6 @@ public void MessageHandlerReceivedMessageServerClient() networkManager.HandleIncomingData(0, NetworkChannel.Internal, new ArraySegment(messageStream.GetBuffer(), 0, (int)messageStream.Length), 0, true); } - // Should cause log (server and client) - LogAssert.Expect(LogType.Log, nameof(MessageHandlerReceivedMessageServerClient) + " " + nameof(DummyMessageHandler.HandleNetworkVariableUpdate)); - using (var messageStream = MessagePacker.WrapMessage(NetworkConstants.NETWORK_VARIABLE_UPDATE, inputBuffer)) - { - networkManager.HandleIncomingData(0, NetworkChannel.Internal, new ArraySegment(messageStream.GetBuffer(), 0, (int)messageStream.Length), 0, true); - } - // Should cause log (server and client) LogAssert.Expect(LogType.Log, nameof(MessageHandlerReceivedMessageServerClient) + " " + nameof(DummyMessageHandler.HandleUnnamedMessage)); using (var messageStream = MessagePacker.WrapMessage(NetworkConstants.UNNAMED_MESSAGE, inputBuffer))