From 10ed439f571901e865dd3187dc33bcf58350d6ff Mon Sep 17 00:00:00 2001 From: Jeffrey Rainy Date: Tue, 3 Aug 2021 13:45:35 -0400 Subject: [PATCH 1/2] snapshot: merge preparation. Removing old acks, removing unused variables --- .../Runtime/Core/SnapshotSystem.cs | 17 ----------------- .../Runtime/Messaging/InternalMessageHandler.cs | 5 ----- .../MessageQueue/MessageQueueContainer.cs | 1 - .../MessageQueue/MessageQueueProcessor.cs | 3 --- .../Manual/Scripts/ManualNetworkVariableTest.cs | 1 - 5 files changed, 27 deletions(-) diff --git a/com.unity.multiplayer.mlapi/Runtime/Core/SnapshotSystem.cs b/com.unity.multiplayer.mlapi/Runtime/Core/SnapshotSystem.cs index 9d1589bd79..3e1a4be95a 100644 --- a/com.unity.multiplayer.mlapi/Runtime/Core/SnapshotSystem.cs +++ b/com.unity.multiplayer.mlapi/Runtime/Core/SnapshotSystem.cs @@ -478,8 +478,6 @@ public void ReadSnapshot(ulong clientId, Stream snapshotStream) snapshot.ReadIndex(reader); snapshot.ReadBuffer(reader, snapshotStream); } - - SendAck(clientId, snapshotTick); } public void ReadAck(ulong clientId, Stream snapshotStream) @@ -491,21 +489,6 @@ public void ReadAck(ulong clientId, Stream snapshotStream) } } - public void SendAck(ulong clientId, int tick) - { - var context = m_NetworkManager.MessageQueueContainer.EnterInternalCommandContext( - MessageQueueContainer.MessageType.SnapshotAck, NetworkChannel.SnapshotExchange, - new[] { clientId }, NetworkUpdateLoop.UpdateStage); - - if (context != null) - { - using (var nonNullContext = (InternalCommandContext)context) - { - nonNullContext.NetworkWriter.WriteInt32Packed(tick); - } - } - } - // todo --M1-- // This is temporary debugging code. Once the feature is complete, we can consider removing it // But we could also leave it in in debug to help developers diff --git a/com.unity.multiplayer.mlapi/Runtime/Messaging/InternalMessageHandler.cs b/com.unity.multiplayer.mlapi/Runtime/Messaging/InternalMessageHandler.cs index 912003e3d8..0a8cd16055 100644 --- a/com.unity.multiplayer.mlapi/Runtime/Messaging/InternalMessageHandler.cs +++ b/com.unity.multiplayer.mlapi/Runtime/Messaging/InternalMessageHandler.cs @@ -406,11 +406,6 @@ internal static void HandleSnapshot(ulong clientId, Stream messageStream) NetworkManager.Singleton.SnapshotSystem.ReadSnapshot(clientId, messageStream); } - internal static void HandleAck(ulong clientId, Stream messageStream) - { - NetworkManager.Singleton.SnapshotSystem.ReadAck(clientId, messageStream); - } - public void HandleAllClientsSwitchSceneCompleted(ulong clientId, Stream stream) { using (var reader = PooledNetworkReader.Get(stream)) diff --git a/com.unity.multiplayer.mlapi/Runtime/Messaging/MessageQueue/MessageQueueContainer.cs b/com.unity.multiplayer.mlapi/Runtime/Messaging/MessageQueue/MessageQueueContainer.cs index 12c39ebf36..d4f64a6acb 100644 --- a/com.unity.multiplayer.mlapi/Runtime/Messaging/MessageQueue/MessageQueueContainer.cs +++ b/com.unity.multiplayer.mlapi/Runtime/Messaging/MessageQueue/MessageQueueContainer.cs @@ -37,7 +37,6 @@ public enum MessageType NamedMessage, ServerLog, SnapshotData, - SnapshotAck, NetworkVariableDelta, SwitchScene, ClientSwitchSceneCompleted, diff --git a/com.unity.multiplayer.mlapi/Runtime/Messaging/MessageQueue/MessageQueueProcessor.cs b/com.unity.multiplayer.mlapi/Runtime/Messaging/MessageQueue/MessageQueueProcessor.cs index 13b464e9d6..505e7c6af0 100644 --- a/com.unity.multiplayer.mlapi/Runtime/Messaging/MessageQueue/MessageQueueProcessor.cs +++ b/com.unity.multiplayer.mlapi/Runtime/Messaging/MessageQueue/MessageQueueProcessor.cs @@ -123,9 +123,6 @@ public void ProcessMessage(in MessageFrameItem item) case MessageQueueContainer.MessageType.SnapshotData: InternalMessageHandler.HandleSnapshot(item.NetworkId, item.NetworkBuffer); break; - case MessageQueueContainer.MessageType.SnapshotAck: - InternalMessageHandler.HandleAck(item.NetworkId, item.NetworkBuffer); - break; case MessageQueueContainer.MessageType.NetworkVariableDelta: m_NetworkManager.MessageHandler.HandleNetworkVariableDelta(item.NetworkId, item.NetworkBuffer); break; diff --git a/testproject/Assets/Tests/Manual/Scripts/ManualNetworkVariableTest.cs b/testproject/Assets/Tests/Manual/Scripts/ManualNetworkVariableTest.cs index fe6970686c..b1e7a38cb1 100644 --- a/testproject/Assets/Tests/Manual/Scripts/ManualNetworkVariableTest.cs +++ b/testproject/Assets/Tests/Manual/Scripts/ManualNetworkVariableTest.cs @@ -28,7 +28,6 @@ public class ManualNetworkVariableTest : NetworkBehaviour private NetworkVariable m_TestVar = new NetworkVariable(); private string m_Problems = string.Empty; - private int m_Count = 0; private bool m_Started = false; private const int k_EndValue = 1000; From 9674acc185725f3909749431577ca9395b3527be Mon Sep 17 00:00:00 2001 From: Jeffrey Rainy Date: Tue, 3 Aug 2021 13:45:35 -0400 Subject: [PATCH 2/2] feat: snapshot. merge preparation. Removing old acks, removing unused variables --- .../Runtime/Core/SnapshotSystem.cs | 17 ----------------- .../Runtime/Messaging/InternalMessageHandler.cs | 5 ----- .../MessageQueue/MessageQueueContainer.cs | 1 - .../MessageQueue/MessageQueueProcessor.cs | 3 --- .../Manual/Scripts/ManualNetworkVariableTest.cs | 1 - 5 files changed, 27 deletions(-) diff --git a/com.unity.multiplayer.mlapi/Runtime/Core/SnapshotSystem.cs b/com.unity.multiplayer.mlapi/Runtime/Core/SnapshotSystem.cs index 9d1589bd79..3e1a4be95a 100644 --- a/com.unity.multiplayer.mlapi/Runtime/Core/SnapshotSystem.cs +++ b/com.unity.multiplayer.mlapi/Runtime/Core/SnapshotSystem.cs @@ -478,8 +478,6 @@ public void ReadSnapshot(ulong clientId, Stream snapshotStream) snapshot.ReadIndex(reader); snapshot.ReadBuffer(reader, snapshotStream); } - - SendAck(clientId, snapshotTick); } public void ReadAck(ulong clientId, Stream snapshotStream) @@ -491,21 +489,6 @@ public void ReadAck(ulong clientId, Stream snapshotStream) } } - public void SendAck(ulong clientId, int tick) - { - var context = m_NetworkManager.MessageQueueContainer.EnterInternalCommandContext( - MessageQueueContainer.MessageType.SnapshotAck, NetworkChannel.SnapshotExchange, - new[] { clientId }, NetworkUpdateLoop.UpdateStage); - - if (context != null) - { - using (var nonNullContext = (InternalCommandContext)context) - { - nonNullContext.NetworkWriter.WriteInt32Packed(tick); - } - } - } - // todo --M1-- // This is temporary debugging code. Once the feature is complete, we can consider removing it // But we could also leave it in in debug to help developers diff --git a/com.unity.multiplayer.mlapi/Runtime/Messaging/InternalMessageHandler.cs b/com.unity.multiplayer.mlapi/Runtime/Messaging/InternalMessageHandler.cs index 912003e3d8..0a8cd16055 100644 --- a/com.unity.multiplayer.mlapi/Runtime/Messaging/InternalMessageHandler.cs +++ b/com.unity.multiplayer.mlapi/Runtime/Messaging/InternalMessageHandler.cs @@ -406,11 +406,6 @@ internal static void HandleSnapshot(ulong clientId, Stream messageStream) NetworkManager.Singleton.SnapshotSystem.ReadSnapshot(clientId, messageStream); } - internal static void HandleAck(ulong clientId, Stream messageStream) - { - NetworkManager.Singleton.SnapshotSystem.ReadAck(clientId, messageStream); - } - public void HandleAllClientsSwitchSceneCompleted(ulong clientId, Stream stream) { using (var reader = PooledNetworkReader.Get(stream)) diff --git a/com.unity.multiplayer.mlapi/Runtime/Messaging/MessageQueue/MessageQueueContainer.cs b/com.unity.multiplayer.mlapi/Runtime/Messaging/MessageQueue/MessageQueueContainer.cs index 12c39ebf36..d4f64a6acb 100644 --- a/com.unity.multiplayer.mlapi/Runtime/Messaging/MessageQueue/MessageQueueContainer.cs +++ b/com.unity.multiplayer.mlapi/Runtime/Messaging/MessageQueue/MessageQueueContainer.cs @@ -37,7 +37,6 @@ public enum MessageType NamedMessage, ServerLog, SnapshotData, - SnapshotAck, NetworkVariableDelta, SwitchScene, ClientSwitchSceneCompleted, diff --git a/com.unity.multiplayer.mlapi/Runtime/Messaging/MessageQueue/MessageQueueProcessor.cs b/com.unity.multiplayer.mlapi/Runtime/Messaging/MessageQueue/MessageQueueProcessor.cs index 13b464e9d6..505e7c6af0 100644 --- a/com.unity.multiplayer.mlapi/Runtime/Messaging/MessageQueue/MessageQueueProcessor.cs +++ b/com.unity.multiplayer.mlapi/Runtime/Messaging/MessageQueue/MessageQueueProcessor.cs @@ -123,9 +123,6 @@ public void ProcessMessage(in MessageFrameItem item) case MessageQueueContainer.MessageType.SnapshotData: InternalMessageHandler.HandleSnapshot(item.NetworkId, item.NetworkBuffer); break; - case MessageQueueContainer.MessageType.SnapshotAck: - InternalMessageHandler.HandleAck(item.NetworkId, item.NetworkBuffer); - break; case MessageQueueContainer.MessageType.NetworkVariableDelta: m_NetworkManager.MessageHandler.HandleNetworkVariableDelta(item.NetworkId, item.NetworkBuffer); break; diff --git a/testproject/Assets/Tests/Manual/Scripts/ManualNetworkVariableTest.cs b/testproject/Assets/Tests/Manual/Scripts/ManualNetworkVariableTest.cs index fe6970686c..b1e7a38cb1 100644 --- a/testproject/Assets/Tests/Manual/Scripts/ManualNetworkVariableTest.cs +++ b/testproject/Assets/Tests/Manual/Scripts/ManualNetworkVariableTest.cs @@ -28,7 +28,6 @@ public class ManualNetworkVariableTest : NetworkBehaviour private NetworkVariable m_TestVar = new NetworkVariable(); private string m_Problems = string.Empty; - private int m_Count = 0; private bool m_Started = false; private const int k_EndValue = 1000;