Skip to content

fix: RpcQueueContainer maximum frames cap, m_NetworkManager null check, and spelling #578

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
NoelStephensUnity merged 1 commit into from
Mar 10, 2021
Merged

fix: RpcQueueContainer maximum frames cap, m_NetworkManager null check, and spelling #578

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 6 additions & 6 deletions com.unity.multiplayer.mlapi/Runtime/Messaging/RpcQueue/RpcQueueContainer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ public enum RpcQueueProcessingTypes
private bool m_ProcessUpdateStagesExternally;
private bool m_IsNotUsingBatching;

internal NetworkManager m_NetworkManager;
internal readonly NetworkManager m_NetworkManager;

public bool IsUsingBatching()
{
Expand Down Expand Up @@ -584,15 +584,16 @@ public void NetworkUpdate(NetworkUpdateStage updateStage)
/// <param name="maxFrameHistory"></param>
private void Initialize(uint maxFrameHistory)
{
//This makes sure that we don't exceed a rediculous value by capping the number of queue history frames to ushort.MaxValue
//This makes sure that we don't exceed a ridiculous value by capping the number of queue history frames to ushort.MaxValue
//If this value is exceeded, then it will be kept at the ceiling of ushort.Maxvalue.
//Note: If running at a 60pps rate (16ms update frequency) this would yield 17.47 minutes worth of queue frame history.
if (maxFrameHistory > ushort.MaxValue)
{
if (NetworkLog.CurrentLogLevel == LogLevel.Developer)
{
NetworkLog.LogWarning($"The maximum {nameof(RpcQueueHistoryFrame)} is {ushort.MaxValue}!");
NetworkLog.LogWarning($"The {nameof(RpcQueueHistoryFrame)} size cannot exceed {ushort.MaxValue} {nameof(RpcQueueHistoryFrame)}s! Capping at {ushort.MaxValue} {nameof(RpcQueueHistoryFrame)}s.");
}
maxFrameHistory = ushort.MaxValue;
}

ClearParameters();
Expand Down Expand Up @@ -684,9 +685,8 @@ private void Shutdown()
this.UnregisterAllNetworkUpdates();
}

bool isListening = !ReferenceEquals(m_NetworkManager, null) && m_NetworkManager.IsListening;
//We need to make sure all internal messages (i.e. object destroy) are sent
m_RpcQueueProcessor.InternalMessagesSendAndFlush(isListening);
//We need to make sure any remaining internal messages are sent before completely shutting down.
m_RpcQueueProcessor.InternalMessagesSendAndFlush(m_NetworkManager.IsListening);

//Dispose of any readers and writers
foreach (var queueHistorySection in QueueHistory)
Expand Down