Skip to content

fix: Dispose of PooledBitStream used in the MessageBatcher, also stor… #436

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
0xFA11 merged 5 commits into from
Jan 13, 2021
Merged

fix: Dispose of PooledBitStream used in the MessageBatcher, also stor… #436

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
27c6be7
fix: Dispose of PooledBitStream used in the MessageBatcher, also stor…
jeffreyrainy Jan 11, 2021
38463c9
perf: avoid transport issues by dropping message size
jeffreyrainy Jan 11, 2021
79a3d8e
style: using 'using' instead of manually 'dispose'ing
jeffreyrainy Jan 12, 2021
02307b8
Merge branch 'develop' into feature/rpcbatch-memoryfix
0xFA11 Jan 12, 2021
83065d2
Merge branch 'develop' into feature/rpcbatch-memoryfix
0xFA11 Jan 12, 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
8 changes: 5 additions & 3 deletions com.unity.multiplayer.mlapi/Runtime/Core/MessageBatcher.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ class MessageBatcher
{
public class SendStream
{
public FrameQueueItem Item;
public string channel;
public PooledBitStream Stream = PooledBitStream.Get();
public bool Empty = true;
}
Expand Down Expand Up @@ -114,7 +114,7 @@ public void QueueItem(in FrameQueueItem item)
if (SendDict[clientId].Empty)
{
SendDict[clientId].Empty = false;
SendDict[clientId].Item = item;
SendDict[clientId].channel = item.Channel;
Writer.SetStream(SendDict[clientId].Stream);

Writer.WriteBit(false); // Encrypted
Expand Down Expand Up @@ -187,6 +187,7 @@ public void SendItems(int threshold, SendCallbackType sendCallback)
/// <param name="receiveTime"> the packet receive time to pass back to callback</param>
public int ReceiveItems(in BitStream messageStream, ReceiveCallbackType receiveCallback, MLAPI.RPCQueueManager.QueueItemType messageType, ulong clientId, float receiveTime)
{
PooledBitStream copy = PooledBitStream.Get();
Comment thread
jeffreyrainy marked this conversation as resolved.
Outdated
do
{
// read the length of the next RPC
Expand All @@ -195,12 +196,12 @@ public int ReceiveItems(in BitStream messageStream, ReceiveCallbackType receiveC
if (rpcSize < 0)
{
// abort if there's an error reading lengths
copy.Dispose();
return 0;
}

// copy what comes after current stream position
long pos = messageStream.Position;
BitStream copy = PooledBitStream.Get();
copy.SetLength(rpcSize);
copy.Position = 0;
Buffer.BlockCopy(messageStream.GetBuffer(), (int)pos, copy.GetBuffer(), 0, rpcSize);
Expand All @@ -211,6 +212,7 @@ public int ReceiveItems(in BitStream messageStream, ReceiveCallbackType receiveC
// RPCReceiveQueueItem peeks at content, it doesn't advance
messageStream.Seek(rpcSize, SeekOrigin.Current);
} while (messageStream.Position < messageStream.Length);
copy.Dispose();
return 0;
}
}
Expand Down
4 changes: 2 additions & 2 deletions com.unity.multiplayer.mlapi/Runtime/Core/RPCQueue/RPCQueueProcessing.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ internal class RPCQueueProcessing
#endif
// Batcher object used to manage the RPC batching on the send side
private MessageBatcher batcher = new MessageBatcher();
private int BatchThreshold = 1000;
private int BatchThreshold = 512;
Comment thread
jeffreyrainy marked this conversation as resolved.

//NSS-TODO: Need to determine how we want to handle all other MLAPI send types
//Temporary place to keep internal MLAPI messages
Expand Down Expand Up @@ -208,7 +208,7 @@ private static void SendCallback(ulong clientId, MLAPI.MessageBatcher.SendStream
ArraySegment<byte> sendBuffer = new ArraySegment<byte>(bytes, 0, length);

NetworkingManager.Singleton.NetworkConfig.NetworkTransport.Send(clientId, sendBuffer,
string.IsNullOrEmpty(sendStream.Item.Channel) ? "MLAPI_DEFAULT_MESSAGE" : sendStream.Item.Channel);
string.IsNullOrEmpty(sendStream.channel) ? "MLAPI_DEFAULT_MESSAGE" : sendStream.channel);
}
}
}