Skip to content

refactor: Snapshot prep. createObjects and destroyObjects dead code #1040

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 11, 2021
Merged

refactor: Snapshot prep. createObjects and destroyObjects dead code #1040

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
06fa09f
refactor: removing dead code following previous PR
jeffreyrainy Aug 10, 2021
68a1e95
refactor: removing dead code following previous PR (destroyObjects)
jeffreyrainy Aug 10, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions com.unity.multiplayer.mlapi/Runtime/Messaging/IInternalMessageHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@ internal interface IInternalMessageHandler
void HandleSwitchScene(ulong clientId, Stream stream);
void HandleClientSwitchSceneCompleted(ulong clientId, Stream stream);
void HandleChangeOwner(ulong clientId, Stream stream);
void HandleAddObjects(ulong clientId, Stream stream);
void HandleDestroyObjects(ulong clientId, Stream stream);
void HandleTimeSync(ulong clientId, Stream stream);
void HandleNetworkVariableDelta(ulong clientId, Stream stream);
void MessageReceiveQueueItem(ulong clientId, Stream stream, float receiveTime, MessageQueueContainer.MessageType messageType, NetworkChannel receiveChannel);
Expand Down
26 changes: 0 additions & 26 deletions com.unity.multiplayer.mlapi/Runtime/Messaging/InternalMessageHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,32 +223,6 @@ public void HandleChangeOwner(ulong clientId, Stream stream)
}
}

public void HandleAddObjects(ulong clientId, Stream stream)
{
using (var reader = PooledNetworkReader.Get(stream))
{
ushort objectCount = reader.ReadUInt16Packed();

for (int i = 0; i < objectCount; i++)
{
HandleAddObject(clientId, stream);
}
}
}

public void HandleDestroyObjects(ulong clientId, Stream stream)
{
using (var reader = PooledNetworkReader.Get(stream))
{
ushort objectCount = reader.ReadUInt16Packed();

for (int i = 0; i < objectCount; i++)
{
HandleDestroyObject(clientId, stream);
}
}
}

public void HandleTimeSync(ulong clientId, Stream stream)
{
using (var reader = PooledNetworkReader.Get(stream))
Expand Down
2 changes: 0 additions & 2 deletions com.unity.multiplayer.mlapi/Runtime/Messaging/MessageQueue/MessageQueueContainer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,7 @@ public enum MessageType
ClientRpc,
ServerRpc,
CreateObject,
CreateObjects,
DestroyObject,
DestroyObjects,
ChangeOwner,
TimeSync,
UnnamedMessage,
Expand Down
14 changes: 0 additions & 14 deletions com.unity.multiplayer.mlapi/Runtime/Messaging/MessageQueue/MessageQueueProcessor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,27 +67,13 @@ public void ProcessMessage(in MessageFrameItem item)
m_NetworkManager.MessageHandler.HandleAddObject(item.NetworkId, item.NetworkBuffer);
}

break;
case MessageQueueContainer.MessageType.CreateObjects:
if (m_NetworkManager.IsClient)
{
m_NetworkManager.MessageHandler.HandleAddObjects(item.NetworkId, item.NetworkBuffer);
}

break;
case MessageQueueContainer.MessageType.DestroyObject:
if (m_NetworkManager.IsClient)
{
m_NetworkManager.MessageHandler.HandleDestroyObject(item.NetworkId, item.NetworkBuffer);
}

break;
case MessageQueueContainer.MessageType.DestroyObjects:
if (m_NetworkManager.IsClient)
{
m_NetworkManager.MessageHandler.HandleDestroyObjects(item.NetworkId, item.NetworkBuffer);
}

break;
case MessageQueueContainer.MessageType.ChangeOwner:
if (m_NetworkManager.IsClient)
Expand Down
20 changes: 0 additions & 20 deletions com.unity.multiplayer.mlapi/Runtime/Profiling/InternalMessageHandlerProfilingDecorator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@ internal class InternalMessageHandlerProfilingDecorator : IInternalMessageHandle
private readonly ProfilerMarker m_HandleSwitchScene = new ProfilerMarker($"{nameof(InternalMessageHandler)}.{nameof(HandleSwitchScene)}");
private readonly ProfilerMarker m_HandleClientSwitchSceneCompleted = new ProfilerMarker($"{nameof(InternalMessageHandler)}.{nameof(HandleClientSwitchSceneCompleted)}");
private readonly ProfilerMarker m_HandleChangeOwner = new ProfilerMarker($"{nameof(InternalMessageHandler)}.{nameof(HandleChangeOwner)}");
private readonly ProfilerMarker m_HandleAddObjects = new ProfilerMarker($"{nameof(InternalMessageHandler)}.{nameof(HandleAddObjects)}");
private readonly ProfilerMarker m_HandleDestroyObjects = new ProfilerMarker($"{nameof(InternalMessageHandler)}.{nameof(HandleDestroyObjects)}");
private readonly ProfilerMarker m_HandleTimeSync = new ProfilerMarker($"{nameof(InternalMessageHandler)}.{nameof(HandleTimeSync)}");
private readonly ProfilerMarker m_HandleNetworkVariableDelta = new ProfilerMarker($"{nameof(InternalMessageHandler)}.{nameof(HandleNetworkVariableDelta)}");
private readonly ProfilerMarker m_HandleUnnamedMessage = new ProfilerMarker($"{nameof(InternalMessageHandler)}.{nameof(HandleUnnamedMessage)}");
Expand Down Expand Up @@ -96,24 +94,6 @@ public void HandleChangeOwner(ulong clientId, Stream stream)
m_HandleChangeOwner.End();
}

public void HandleAddObjects(ulong clientId, Stream stream)
{
m_HandleAddObjects.Begin();

m_MessageHandler.HandleAddObjects(clientId, stream);

m_HandleAddObjects.End();
}

public void HandleDestroyObjects(ulong clientId, Stream stream)
{
m_HandleDestroyObjects.Begin();

m_MessageHandler.HandleDestroyObjects(clientId, stream);

m_HandleDestroyObjects.End();
}

public void HandleTimeSync(ulong clientId, Stream stream)
{
m_HandleTimeSync.Begin();
Expand Down
4 changes: 0 additions & 4 deletions com.unity.multiplayer.mlapi/Tests/Editor/DummyMessageHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,6 @@ public DummyMessageHandler(NetworkManager networkManager)

public void HandleChangeOwner(ulong clientId, Stream stream) => VerifyCalled(nameof(HandleChangeOwner));

public void HandleAddObjects(ulong clientId, Stream stream) => VerifyCalled(nameof(HandleAddObjects));

public void HandleDestroyObjects(ulong clientId, Stream stream) => VerifyCalled(nameof(HandleDestroyObjects));

public void HandleTimeSync(ulong clientId, Stream stream) => VerifyCalled(nameof(HandleTimeSync));

public void HandleNetworkVariableDelta(ulong clientId, Stream stream) => VerifyCalled(nameof(HandleNetworkVariableDelta));
Expand Down
34 changes: 0 additions & 34 deletions com.unity.multiplayer.mlapi/Tests/Editor/NetworkManagerMessageHandlerTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,22 +93,6 @@ public void MessageHandlerReceivedMessageServerClient()
networkManager.HandleIncomingData(0, NetworkChannel.Internal, new ArraySegment<byte>(messageStream.GetBuffer(), 0, (int)messageStream.Length), 0);
}

// Should not cause log (client only)
// Everything should log MessageReceiveQueueItem even if ignored
LogAssert.Expect(LogType.Log, nameof(DummyMessageHandler.MessageReceiveQueueItem));
using (var messageStream = MessagePacker.WrapMessage(MessageQueueContainer.MessageType.CreateObjects, inputBuffer, networkManager.MessageQueueContainer.IsUsingBatching()))
{
networkManager.HandleIncomingData(0, NetworkChannel.Internal, new ArraySegment<byte>(messageStream.GetBuffer(), 0, (int)messageStream.Length), 0);
}

// Should not cause log (client only)
// Everything should log MessageReceiveQueueItem even if ignored
LogAssert.Expect(LogType.Log, nameof(DummyMessageHandler.MessageReceiveQueueItem));
using (var messageStream = MessagePacker.WrapMessage(MessageQueueContainer.MessageType.DestroyObjects, inputBuffer, networkManager.MessageQueueContainer.IsUsingBatching()))
{
networkManager.HandleIncomingData(0, NetworkChannel.Internal, new ArraySegment<byte>(messageStream.GetBuffer(), 0, (int)messageStream.Length), 0);
}

// Should not cause log (client only)
// Everything should log MessageReceiveQueueItem even if ignored
LogAssert.Expect(LogType.Log, nameof(DummyMessageHandler.MessageReceiveQueueItem));
Expand Down Expand Up @@ -228,24 +212,6 @@ public void MessageHandlerReceivedMessageServerClient()
networkManager.HandleIncomingData(0, NetworkChannel.Internal, new ArraySegment<byte>(messageStream.GetBuffer(), 0, (int)messageStream.Length), 0);
}

// Should cause log (client only)
// Everything should log MessageReceiveQueueItem even if ignored
LogAssert.Expect(LogType.Log, nameof(DummyMessageHandler.MessageReceiveQueueItem));
LogAssert.Expect(LogType.Log, nameof(DummyMessageHandler.HandleAddObjects));
using (var messageStream = MessagePacker.WrapMessage(MessageQueueContainer.MessageType.CreateObjects, inputBuffer, networkManager.MessageQueueContainer.IsUsingBatching()))
{
networkManager.HandleIncomingData(0, NetworkChannel.Internal, new ArraySegment<byte>(messageStream.GetBuffer(), 0, (int)messageStream.Length), 0);
}

// Should cause log (client only)
// Everything should log MessageReceiveQueueItem even if ignored
LogAssert.Expect(LogType.Log, nameof(DummyMessageHandler.MessageReceiveQueueItem));
LogAssert.Expect(LogType.Log, nameof(DummyMessageHandler.HandleDestroyObjects));
using (var messageStream = MessagePacker.WrapMessage(MessageQueueContainer.MessageType.DestroyObjects, inputBuffer, networkManager.MessageQueueContainer.IsUsingBatching()))
{
networkManager.HandleIncomingData(0, NetworkChannel.Internal, new ArraySegment<byte>(messageStream.GetBuffer(), 0, (int)messageStream.Length), 0);
}

// Should cause log (client only)
// Everything should log MessageReceiveQueueItem even if ignored
LogAssert.Expect(LogType.Log, nameof(DummyMessageHandler.MessageReceiveQueueItem));
Expand Down
16 changes: 0 additions & 16 deletions ...multiplayer.mlapi/Tests/Editor/Profiling/InternalMessageHandlerProfilingDecoratorTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,22 +70,6 @@ public void HandleChangeOwnerCallsUnderlyingHandler()
LogAssert.Expect(LogType.Log, nameof(m_Decorator.HandleChangeOwner));
}

[Test]
public void HandleAddObjectsCallsUnderlyingHandler()
{
m_Decorator.HandleAddObjects(0, null);

LogAssert.Expect(LogType.Log, nameof(m_Decorator.HandleAddObjects));
}

[Test]
public void HandleDestroyObjectsCallsUnderlyingHandler()
{
m_Decorator.HandleDestroyObjects(0, null);

LogAssert.Expect(LogType.Log, nameof(m_Decorator.HandleDestroyObjects));
}

[Test]
public void HandleNetworkVariableDeltaCallsUnderlyingHandler()
{
Expand Down