Skip to content

fix: RpcQueueContainer deregister from NetworkUpdateManager #453

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 7 commits into from
Jan 22, 2021
Merged

fix: RpcQueueContainer deregister from NetworkUpdateManager #453

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
bcc38df
fix: deregistration fix
NoelStephensUnity Jan 20, 2021
41ea501
refactor: Removing comment
NoelStephensUnity Jan 20, 2021
f8e6cb8
Merge branch 'develop' into fix/RpcQueueContainerRegistration
NoelStephensUnity Jan 21, 2021
945c342
refactor: code clarity
NoelStephensUnity Jan 22, 2021
1ddb612
Merge branch 'develop' into fix/RpcQueueContainerRegistration
NoelStephensUnity Jan 22, 2021
ff71b61
fix: compilation error
NoelStephensUnity Jan 22, 2021
0e1c103
refactor: Putting ClearParameters back
NoelStephensUnity Jan 22, 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
5 changes: 3 additions & 2 deletions com.unity.multiplayer.mlapi/Runtime/Core/NetworkingManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -670,7 +670,7 @@ private void OnDestroy()
{
OnNetworkLoopSystemRemove();
//NSS: This is ok to leave this check here
rpcQueueContainer?.OnExiting();
rpcQueueContainer?.Shutdown();

if (Singleton != null && Singleton == this)
{
Expand All @@ -693,7 +693,8 @@ private void Shutdown()
SpawnManager.DestroyNonSceneObjects();
SpawnManager.ServerResetShudownStateForSceneObjects();

if (NetworkConfig != null && NetworkConfig.NetworkTransport != null) //The Transport is set during Init time, thus it is possible for the Transport to be null
//The Transport is set during Init time, thus it is possible for the Transport to be null
if (NetworkConfig != null && NetworkConfig.NetworkTransport != null)
NetworkConfig.NetworkTransport.Shutdown();

if (rpcQueueContainer != null)
Expand Down
20 changes: 9 additions & 11 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 @@ -649,8 +649,9 @@ public bool IsTesting()
return m_IsTestingEnabled;
}


/// <summary>
/// Clears all declared parameters
/// Clears the stream indices and frames process properties
/// </summary>
private void ClearParameters()
{
Expand All @@ -661,10 +662,12 @@ private void ClearParameters()
}

/// <summary>
/// OnExiting
/// Called upon exiting to assure any last messages are delivered.
/// Shutdown
/// Flushes the internal messages
/// Removes itself from the network update loop
/// Disposes readers, writers, clears the queue history, and resets any parameters
/// </summary>
public void OnExiting()
public void Shutdown()
{
//We need to make sure all internal messages (i.e. object destroy) are sent
rpcQueueProcessing.InternalMessagesSendAndFlush();
Expand All @@ -675,14 +678,8 @@ public void OnExiting()
//Remove ourself from the network loop update system
OnNetworkLoopSystemRemove();
}
}

/// <summary>
/// There might be a case where we want to make this class non-static and in that case we would replace this with Dispose and add the IDisposable interface
/// For now, this should be called upon shutdown
/// </summary>
public void Shutdown()
{
//Dispose of any readers and writers
foreach (KeyValuePair<QueueHistoryFrame.QueueFrameType, Dictionary<int, Dictionary<NetworkUpdateManager.NetworkUpdateStages, QueueHistoryFrame>>> queueHistorySection in QueueHistory)
{
foreach (KeyValuePair<int, Dictionary<NetworkUpdateManager.NetworkUpdateStages, QueueHistoryFrame>> queueHistoryItemByStage in queueHistorySection.Value)
Expand All @@ -696,6 +693,7 @@ public void Shutdown()
}
}

//Clear history and parameters
QueueHistory.Clear();

ClearParameters();
Expand Down