Skip to content

refactor: BufferManager is no longer static #705

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
Apr 6, 2021
Merged

refactor: BufferManager is no longer static #705

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
4c83b0a
refactor: BufferManager is no longer static
TwoTenPvP Apr 6, 2021
848056c
Made buffer manager only active during initialized networkmanager
TwoTenPvP Apr 6, 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
9 changes: 9 additions & 0 deletions com.unity.multiplayer.mlapi/Runtime/Core/NetworkManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,8 @@ public class NetworkManager : MonoBehaviour, INetworkUpdateSystem, IProfilableTr
/// </summary>
public NetworkSpawnManager SpawnManager { get; private set; }

internal BufferManager BufferManager { get; private set; }

/// <summary>
/// Gets the networkId of the server
/// </summary>
Expand Down Expand Up @@ -321,6 +323,8 @@ private void Init(bool server)
// Create spawn manager instance
SpawnManager = new NetworkSpawnManager(this);

BufferManager = new BufferManager();

NetworkSceneManager.RegisteredSceneNames.Clear();
NetworkSceneManager.SceneIndexToString.Clear();
NetworkSceneManager.SceneNameToIndex.Clear();
Expand Down Expand Up @@ -696,6 +700,11 @@ public void Shutdown()
IsClient = false;
NetworkConfig.NetworkTransport.OnTransportEvent -= HandleRawTransportPoll;

if (BufferManager != null)
{
BufferManager = null;
}

if (SpawnManager != null)
{
SpawnManager.DestroyNonSceneObjects();
Expand Down
34 changes: 17 additions & 17 deletions com.unity.multiplayer.mlapi/Runtime/Messaging/Buffering/BufferManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@

namespace MLAPI.Messaging.Buffering
{
internal static class BufferManager
internal class BufferManager
{
#if DEVELOPMENT_BUILD || UNITY_EDITOR
private static ProfilerMarker s_CleanBuffer = new ProfilerMarker($"{nameof(BufferManager)}.{nameof(CleanBuffer)}");
#endif

private static Dictionary<ulong, Queue<BufferedMessage>> s_BufferQueues = new Dictionary<ulong, Queue<BufferedMessage>>();
private readonly Dictionary<ulong, Queue<BufferedMessage>> m_BufferQueues = new Dictionary<ulong, Queue<BufferedMessage>>();

internal struct BufferedMessage
{
Expand All @@ -24,13 +24,13 @@ internal struct BufferedMessage
internal float BufferTime;
}

internal static Queue<BufferedMessage> ConsumeBuffersForNetworkId(ulong networkId)
internal Queue<BufferedMessage> ConsumeBuffersForNetworkId(ulong networkId)
{
if (s_BufferQueues.ContainsKey(networkId))
if (m_BufferQueues.ContainsKey(networkId))
{
Queue<BufferedMessage> message = s_BufferQueues[networkId];
Queue<BufferedMessage> message = m_BufferQueues[networkId];

s_BufferQueues.Remove(networkId);
m_BufferQueues.Remove(networkId);

return message;
}
Expand All @@ -45,14 +45,14 @@ internal static void RecycleConsumedBufferedMessage(BufferedMessage message)
message.NetworkBuffer.Dispose();
}

internal static void BufferMessageForNetworkId(ulong networkId, ulong senderClientId, NetworkChannel networkChannel, float receiveTime, ArraySegment<byte> payload)
internal void BufferMessageForNetworkId(ulong networkId, ulong senderClientId, NetworkChannel networkChannel, float receiveTime, ArraySegment<byte> payload)
{
if (!s_BufferQueues.ContainsKey(networkId))
if (!m_BufferQueues.ContainsKey(networkId))
{
s_BufferQueues.Add(networkId, new Queue<BufferedMessage>());
m_BufferQueues.Add(networkId, new Queue<BufferedMessage>());
}

Queue<BufferedMessage> queue = s_BufferQueues[networkId];
Queue<BufferedMessage> queue = m_BufferQueues[networkId];

var payloadBuffer = PooledNetworkBuffer.Get();
payloadBuffer.Write(payload.Array, payload.Offset, payload.Count);
Expand All @@ -68,14 +68,14 @@ internal static void BufferMessageForNetworkId(ulong networkId, ulong senderClie
});
}

private static List<ulong> s_KeysToDestroy = new List<ulong>();
private static readonly List<ulong> k_KeysToDestroy = new List<ulong>();

internal static void CleanBuffer()
internal void CleanBuffer()
{
#if DEVELOPMENT_BUILD || UNITY_EDITOR
s_CleanBuffer.Begin();
#endif
foreach (var pair in s_BufferQueues)
foreach (var pair in m_BufferQueues)
{
while (pair.Value.Count > 0 && Time.realtimeSinceStartup - pair.Value.Peek().BufferTime >= NetworkManager.Singleton.NetworkConfig.MessageBufferTimeout)
{
Expand All @@ -86,16 +86,16 @@ internal static void CleanBuffer()

if (pair.Value.Count == 0)
{
s_KeysToDestroy.Add(pair.Key);
k_KeysToDestroy.Add(pair.Key);
}
}

for (int i = 0; i < s_KeysToDestroy.Count; i++)
for (int i = 0; i < k_KeysToDestroy.Count; i++)
{
s_BufferQueues.Remove(s_KeysToDestroy[i]);
m_BufferQueues.Remove(k_KeysToDestroy[i]);
}

s_KeysToDestroy.Clear();
k_KeysToDestroy.Clear();
#if DEVELOPMENT_BUILD || UNITY_EDITOR
s_CleanBuffer.End();
#endif
Expand Down
4 changes: 2 additions & 2 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 @@ -169,7 +169,7 @@ void DelayedSpawnAction(Stream continuationStream)
var networkObject = NetworkManager.Singleton.SpawnManager.CreateLocalNetworkObject(softSync, instanceId, prefabHash, ownerId, parentNetworkId, pos, rot);
NetworkManager.Singleton.SpawnManager.SpawnNetworkObjectLocally(networkObject, networkId, softSync, isPlayerObject, ownerId, continuationStream, false, 0, true, false);

Queue<BufferManager.BufferedMessage> bufferQueue = BufferManager.ConsumeBuffersForNetworkId(networkId);
Queue<BufferManager.BufferedMessage> bufferQueue = NetworkManager.Singleton.BufferManager.ConsumeBuffersForNetworkId(networkId);

// Apply buffered messages
if (bufferQueue != null)
Expand Down Expand Up @@ -276,7 +276,7 @@ internal static void HandleAddObject(ulong clientId, Stream stream)
var networkObject = NetworkManager.Singleton.SpawnManager.CreateLocalNetworkObject(softSync, instanceId, prefabHash, ownerClientId, parentNetworkId, pos, rot);
NetworkManager.Singleton.SpawnManager.SpawnNetworkObjectLocally(networkObject, networkId, softSync, isPlayerObject, ownerClientId, stream, hasPayload, payLoadLength, true, false);

Queue<BufferManager.BufferedMessage> bufferQueue = BufferManager.ConsumeBuffersForNetworkId(networkId);
Queue<BufferManager.BufferedMessage> bufferQueue = NetworkManager.Singleton.BufferManager.ConsumeBuffersForNetworkId(networkId);

// Apply buffered messages
if (bufferQueue != null)
Expand Down
4 changes: 2 additions & 2 deletions com.unity.multiplayer.mlapi/Runtime/SceneManagement/NetworkSceneManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -369,7 +369,7 @@ private static void OnSceneUnloadClient(Guid switchSceneGuid, Stream objectStrea
var networkObject = NetworkManager.Singleton.SpawnManager.CreateLocalNetworkObject(false, 0, prefabHash, ownerClientId, parentNetworkId, position, rotation);
NetworkManager.Singleton.SpawnManager.SpawnNetworkObjectLocally(networkObject, networkId, true, isPlayerObject, ownerClientId, objectStream, false, 0, true, false);

var bufferQueue = BufferManager.ConsumeBuffersForNetworkId(networkId);
var bufferQueue = NetworkManager.Singleton.BufferManager.ConsumeBuffersForNetworkId(networkId);

// Apply buffered messages
if (bufferQueue != null)
Expand Down Expand Up @@ -411,7 +411,7 @@ private static void OnSceneUnloadClient(Guid switchSceneGuid, Stream objectStrea
var networkObject = NetworkManager.Singleton.SpawnManager.CreateLocalNetworkObject(true, instanceId, 0, ownerClientId, parentNetworkId, null, null);
NetworkManager.Singleton.SpawnManager.SpawnNetworkObjectLocally(networkObject, networkId, true, isPlayerObject, ownerClientId, objectStream, false, 0, true, false);

var bufferQueue = BufferManager.ConsumeBuffersForNetworkId(networkId);
var bufferQueue = NetworkManager.Singleton.BufferManager.ConsumeBuffersForNetworkId(networkId);

// Apply buffered messages
if (bufferQueue != null)
Expand Down