charleslemaux/Mirror
1
0
Fork 0
mirror of https://github.com/MirrorNetworking/Mirror.git synced 2024-11-18 02:50:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: only ack EntityStateMessage, not every batch

Browse Source
This commit is contained in:
mischa 2024-07-20 18:06:05 +02:00
parent f6ebc3ae25
commit b16b7f8eb5
2 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Assets/Mirror/Core/NetworkClient.cs
View File

@ -418,15 +418,6 @@ internal static void OnTransportData(ArraySegment<byte> data, int channelId)
{
Debug.LogError($"Still had {unbatcher.BatchesCount} batches remaining after processing, even though processing was not interrupted by a scene change. This should never happen, as it would cause ever growing batches.\nPossible reasons:\n* A message didn't deserialize as much as it serialized\n*There was no message handler for a message id, so the reader wasn't read until the end.");
}
// FastPaced unreliable sync:
// always acknowledge the last received batch so the other end
// knows what to delta compress against.
if (channelId == Channels.Unreliable)
{
// Debug.Log($"NetworkClient: acknowledging batch {connection.remoteTimeStamp}");
connection.Send(new EntityStateMessageAck{batchTimestamp = connection.remoteTimeStamp}, Channels.Unreliable);
}
}
else Debug.LogError("Skipped Data message handling because connection is null.");
}
@ -1412,6 +1403,7 @@ static void OnEntityStateMessage(EntityStateMessage message)
else Debug.LogWarning($"Did not find target for sync message for {message.netId}. Were all prefabs added to the NetworkManager's spawnable list?\nNote: this can be completely normal because UDP messages may arrive out of order, so this message might have arrived after a Destroy message.");
}
static double lastAckedBatchTimestamp = 0;
static void OnEntityStateMessageUnreliable(EntityStateMessageUnreliable message)
{
// Debug.Log($"NetworkClient.OnUpdateVarsMessage {msg.netId}");
@ -1437,6 +1429,16 @@ static void OnEntityStateMessageUnreliable(EntityStateMessageUnreliable message)
identity.DeserializeClient(reader, true);
}
else Debug.LogWarning($"Did not find target for sync message for {message.netId}. Were all prefabs added to the NetworkManager's spawnable list?\nNote: this can be completely normal because UDP messages may arrive out of order, so this message might have arrived after a Destroy message.");
// unreliable delta compression: always ack entity state messages.
// (that's enough. acking every batch would be too much overhead
// since not every batch contains entity state data.)
// one batch may contain multiple EntityStateMessage, but only ack once per batch
if (lastAckedBatchTimestamp != connection.remoteTimeStamp)
{
connection.Send(new EntityStateMessageAck{ batchTimestamp = connection.remoteTimeStamp });
lastAckedBatchTimestamp = connection.remoteTimeStamp;
}
}
static void OnRPCMessage(RpcMessage message)

20
Assets/Mirror/Core/NetworkServer.cs
View File

@ -418,6 +418,7 @@ static void OnEntityStateMessage(NetworkConnectionToClient connection, EntitySta
}
// for client's owned ClientToServer components.
static double lastAckedBatchTimestamp = 0;
static void OnEntityStateMessageUnreliable(NetworkConnectionToClient connection, EntityStateMessageUnreliable message)
{
// need to validate permissions carefully.
@ -470,6 +471,16 @@ static void OnEntityStateMessageUnreliable(NetworkConnectionToClient connection,
}
// no warning. don't spam server logs.
// else Debug.LogWarning($"Did not find target for sync message for {message.netId} . Note: this can be completely normal because UDP messages may arrive out of order, so this message might have arrived after a Destroy message.");
// unreliable delta compression: always ack entity state messages.
// (that's enough. acking every batch would be too much overhead
// since not every batch contains entity state data.)
// one batch may contain multiple EntityStateMessage, but only ack once per batch
if (lastAckedBatchTimestamp != connection.remoteTimeStamp)
{
connection.Send(new EntityStateMessageAck{ batchTimestamp = connection.remoteTimeStamp });
lastAckedBatchTimestamp = connection.remoteTimeStamp;
}
}
// client sends TimeSnapshotMessage every sendInterval.
@ -904,15 +915,6 @@ internal static void OnTransportData(int connectionId, ArraySegment<byte> data,
{
Debug.LogError($"Still had {connection.unbatcher.BatchesCount} batches remaining after processing, even though processing was not interrupted by a scene change. This should never happen, as it would cause ever growing batches.\nPossible reasons:\n* A message didn't deserialize as much as it serialized\n*There was no message handler for a message id, so the reader wasn't read until the end.");
}
// FastPaced unreliable sync:
// always acknowledge the last received batch so the other end
// knows what to delta compress against.
if (channelId == Channels.Unreliable)
{
// Debug.Log($"NetworkServer: acknowledging batch {connection.remoteTimeStamp}");
connection.Send(new EntityStateMessageAck{batchTimestamp = connection.remoteTimeStamp}, Channels.Unreliable);
}
}
else Debug.LogError($"HandleData Unknown connectionId:{connectionId}");
}