Skip to content

Commit 2bf5b3e

Browse files
kvassall-unitykvassall-unity
committed
Addressing all the current review feedback
1 parent ccad1d4 commit 2bf5b3e

10 files changed

Lines changed: 42 additions & 45 deletions

File tree

‎com.unity.multiplayer.mlapi/Runtime/Core/NetworkedBehaviour.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -800,7 +800,7 @@ internal static void HandleNetworkedVarDeltas(List<INetworkedVar> networkedVarLi
800800
long readStartPos = stream.Position;
801801

802802
networkedVarList[i].ReadDelta(stream, IsServer);
803-
PerformanceDataManager.Increment(ProfilerConstants.NumberNetworkVarsReceived);
803+
PerformanceDataManager.Increment(ProfilerConstants.NumberNetworkVarsReceived.ToString());
804804
ProfilerStatManager.networkVarsRcvd.Record();
805805

806806
if (NetworkingManager.Singleton.NetworkConfig.EnsureNetworkedVarLengthSafety)
@@ -868,7 +868,7 @@ internal static void HandleNetworkedVarUpdate(List<INetworkedVar> networkedVarLi
868868
long readStartPos = stream.Position;
869869

870870
networkedVarList[i].ReadField(stream);
871-
PerformanceDataManager.Increment(ProfilerConstants.NumberNetworkVarsReceived);
871+
PerformanceDataManager.Increment(ProfilerConstants.NumberNetworkVarsReceived.ToString());
872872
ProfilerStatManager.networkVarsRcvd.Record();
873873

874874
if (NetworkingManager.Singleton.NetworkConfig.EnsureNetworkedVarLengthSafety)

‎com.unity.multiplayer.mlapi/Runtime/Core/NetworkingManager.cs‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -746,7 +746,7 @@ private void NetworkPreUpdate()
746746
// Process received data
747747
if ((NetworkTime - m_LastReceiveTickTime >= (1f / NetworkConfig.ReceiveTickrate)) || NetworkConfig.ReceiveTickrate <= 0)
748748
{
749-
PerformanceDataManager.Increment(ProfilerConstants.ReceiveTickRate);
749+
PerformanceDataManager.Increment(ProfilerConstants.ReceiveTickRate.ToString());
750750
ProfilerStatManager.rcvTickRate.Record();
751751
#if DEVELOPMENT_BUILD || UNITY_EDITOR
752752
s_ReceiveTick.Begin();
@@ -861,10 +861,9 @@ private void NetworkUpdate()
861861
}
862862
}
863863

864-
var profileTransport = NetworkConfig.NetworkTransport as ITransportProfilerData;
865-
if (profileTransport != null)
864+
if(NetworkConfig.NetworkTransport is ITransportProfilerData profileTransport)
866865
{
867-
var transportProfilerData = profileTransport.GetTransportGetData();
866+
var transportProfilerData = profileTransport.GetTransportProfilerData();
868867
PerformanceDataManager.AddTransportData(transportProfilerData);
869868
}
870869

@@ -922,7 +921,7 @@ internal IEnumerator TimeOutSwitchSceneProgress(SceneSwitchProgress switchSceneP
922921

923922
private void HandleRawTransportPoll(NetEventType eventType, ulong clientId, Channel channel, ArraySegment<byte> payload, float receiveTime)
924923
{
925-
PerformanceDataManager.Increment(ProfilerConstants.NumberBytesReceived, payload.Count);
924+
PerformanceDataManager.Increment(ProfilerConstants.NumberBytesReceived.ToString(), payload.Count);
926925
ProfilerStatManager.bytesRcvd.Record(payload.Count);
927926
switch (eventType)
928927
{
@@ -1183,7 +1182,7 @@ internal void HandleIncomingData(ulong clientId, Channel channel, ArraySegment<b
11831182
{
11841183
m_RpcBatcher.ReceiveItems(messageStream, ReceiveCallback, RpcQueueContainer.QueueItemType.ServerRpc, clientId, receiveTime);
11851184
ProfilerStatManager.rpcBatchesRcvd.Record();
1186-
PerformanceDataManager.Increment(ProfilerConstants.NumberOfRPCBatchesReceived);
1185+
PerformanceDataManager.Increment(ProfilerConstants.NumberOfRPCBatchesReceived.ToString());
11871186
}
11881187
else
11891188
{
@@ -1206,7 +1205,7 @@ internal void HandleIncomingData(ulong clientId, Channel channel, ArraySegment<b
12061205
{
12071206
m_RpcBatcher.ReceiveItems(messageStream, ReceiveCallback, RpcQueueContainer.QueueItemType.ClientRpc, clientId, receiveTime);
12081207
ProfilerStatManager.rpcBatchesRcvd.Record();
1209-
PerformanceDataManager.Increment(ProfilerConstants.NumberOfRPCBatchesReceived);
1208+
PerformanceDataManager.Increment(ProfilerConstants.NumberOfRPCBatchesReceived.ToString());
12101209
}
12111210
else
12121211
{
@@ -1358,7 +1357,7 @@ public void DisconnectClient(ulong clientId)
13581357
{
13591358
if (ConnectedClientsList[i].ClientId == clientId) {
13601359
ConnectedClientsList.RemoveAt(i);
1361-
PerformanceDataManager.Increment(ProfilerConstants.NumberOfConnections, -1);
1360+
PerformanceDataManager.Increment(ProfilerConstants.NumberOfConnections.ToString(), -1);
13621361
ProfilerStatManager.connections.Record(-1);
13631362
}
13641363
}
@@ -1424,7 +1423,7 @@ internal void OnClientDisconnectFromServer(ulong clientId)
14241423
if (ConnectedClientsList[i].ClientId == clientId)
14251424
{
14261425
ConnectedClientsList.RemoveAt(i);
1427-
PerformanceDataManager.Increment(ProfilerConstants.NumberOfConnections, -1);
1426+
PerformanceDataManager.Increment(ProfilerConstants.NumberOfConnections.ToString(), -1);
14281427
ProfilerStatManager.connections.Record(-1);
14291428
break;
14301429
}
@@ -1473,7 +1472,7 @@ internal void HandleApproval(ulong clientId, bool createPlayerObject, ulong? pla
14731472
ConnectedClients.Add(clientId, client);
14741473
ConnectedClientsList.Add(client);
14751474

1476-
PerformanceDataManager.Increment(ProfilerConstants.NumberOfConnections);
1475+
PerformanceDataManager.Increment(ProfilerConstants.NumberOfConnections.ToString());
14771476
ProfilerStatManager.connections.Record();
14781477

14791478
// This packet is unreliable, but if it gets through it should provide a much better sync than the potentially huge approval message.

‎com.unity.multiplayer.mlapi/Runtime/Messaging/InternalMessageHandler.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -694,15 +694,15 @@ internal static void RPCReceiveQueueItem(ulong clientId, Stream stream, float re
694694
}
695695

696696
ProfilerStatManager.rpcsRcvd.Record();
697-
PerformanceDataManager.Increment(ProfilerConstants.NumberOfRPCsReceived);
697+
PerformanceDataManager.Increment(ProfilerConstants.NumberOfRPCsReceived.ToString());
698698

699699
var rpcQueueContainer = NetworkingManager.Singleton.rpcQueueContainer;
700700
rpcQueueContainer.AddQueueItemToInboundFrame(queueItemType, receiveTime, clientId, (BitStream)stream);
701701
}
702702

703703
internal static void HandleUnnamedMessage(ulong clientId, Stream stream)
704704
{
705-
PerformanceDataManager.Increment(ProfilerConstants.NumberOfUnnamedMessages);
705+
PerformanceDataManager.Increment(ProfilerConstants.NumberOfUnnamedMessages.ToString());
706706
ProfilerStatManager.unnamedMessage.Record();
707707
#if DEVELOPMENT_BUILD || UNITY_EDITOR
708708
s_HandleUnnamedMessage.Begin();
@@ -715,7 +715,7 @@ internal static void HandleUnnamedMessage(ulong clientId, Stream stream)
715715

716716
internal static void HandleNamedMessage(ulong clientId, Stream stream)
717717
{
718-
PerformanceDataManager.Increment(ProfilerConstants.NumberOfNamedMessages);
718+
PerformanceDataManager.Increment(ProfilerConstants.NumberOfNamedMessages.ToString());
719719
ProfilerStatManager.namedMessage.Record();
720720
#if DEVELOPMENT_BUILD || UNITY_EDITOR
721721
s_HandleNamedMessage.Begin();

‎com.unity.multiplayer.mlapi/Runtime/Messaging/InternalMessageSender.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ internal static void Send(ulong clientId, byte messageType, Channel channel, Bit
2626

2727
NetworkingManager.Singleton.NetworkConfig.NetworkTransport.Send(clientId, new ArraySegment<byte>(stream.GetBuffer(), 0, (int)stream.Length), channel);
2828
ProfilerStatManager.bytesSent.Record((int)stream.Length);
29-
PerformanceDataManager.Increment(ProfilerConstants.NumberBytesSent, (int)stream.Length);
29+
PerformanceDataManager.Increment(ProfilerConstants.NumberBytesSent.ToString(), (int)stream.Length);
3030

3131
NetworkProfiler.EndEvent();
3232
}
@@ -58,7 +58,7 @@ internal static void Send(byte messageType, Channel channel, BitStream messageSt
5858

5959
NetworkingManager.Singleton.NetworkConfig.NetworkTransport.Send(NetworkingManager.Singleton.ConnectedClientsList[i].ClientId, new ArraySegment<byte>(stream.GetBuffer(), 0, (int)stream.Length), channel);
6060
ProfilerStatManager.bytesSent.Record((int)stream.Length);
61-
PerformanceDataManager.Increment(ProfilerConstants.NumberBytesSent, (int)stream.Length);
61+
PerformanceDataManager.Increment(ProfilerConstants.NumberBytesSent.ToString(), (int)stream.Length);
6262
}
6363
NetworkProfiler.EndEvent();
6464
}
@@ -97,7 +97,7 @@ internal static void Send(byte messageType, Channel channel, List<ulong> clientI
9797

9898
NetworkingManager.Singleton.NetworkConfig.NetworkTransport.Send(clientIds[i], new ArraySegment<byte>(stream.GetBuffer(), 0, (int)stream.Length), channel);
9999
ProfilerStatManager.bytesSent.Record((int)stream.Length);
100-
PerformanceDataManager.Increment(ProfilerConstants.NumberBytesSent, (int)stream.Length);
100+
PerformanceDataManager.Increment(ProfilerConstants.NumberBytesSent.ToString(), (int)stream.Length);
101101
}
102102
NetworkProfiler.EndEvent();
103103
}
@@ -134,7 +134,7 @@ internal static void Send(byte messageType, Channel channel, ulong clientIdToIgn
134134

135135
NetworkingManager.Singleton.NetworkConfig.NetworkTransport.Send(NetworkingManager.Singleton.ConnectedClientsList[i].ClientId, new ArraySegment<byte>(stream.GetBuffer(), 0, (int)stream.Length), channel);
136136
ProfilerStatManager.bytesSent.Record((int)stream.Length);
137-
PerformanceDataManager.Increment(ProfilerConstants.NumberBytesSent, (int)stream.Length);
137+
PerformanceDataManager.Increment(ProfilerConstants.NumberBytesSent.ToString(), (int)stream.Length);
138138
}
139139
NetworkProfiler.EndEvent();
140140
}

‎com.unity.multiplayer.mlapi/Runtime/Messaging/RpcBatcher.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -149,8 +149,8 @@ public void QueueItem(in RpcFrameQueueItem queueItem)
149149

150150
ProfilerStatManager.bytesSent.Record(queueItem.messageData.Count);
151151
ProfilerStatManager.rpcsSent.Record();
152-
PerformanceDataManager.Increment(ProfilerConstants.NumberBytesSent, queueItem.messageData.Count);
153-
PerformanceDataManager.Increment(ProfilerConstants.NumberOfRPCsSent);
152+
PerformanceDataManager.Increment(ProfilerConstants.NumberBytesSent.ToString(), queueItem.messageData.Count);
153+
PerformanceDataManager.Increment(ProfilerConstants.NumberOfRPCsSent.ToString());
154154
}
155155
}
156156

@@ -180,7 +180,7 @@ public void SendItems(int thresholdBytes, SendCallbackType sendCallback)
180180
entry.Value.Stream.Position = 0;
181181
entry.Value.IsEmpty = true;
182182
ProfilerStatManager.rpcBatchesSent.Record();
183-
PerformanceDataManager.Increment(ProfilerConstants.NumberOfRPCBatchesSent);
183+
PerformanceDataManager.Increment(ProfilerConstants.NumberOfRPCBatchesSent.ToString());
184184
}
185185
}
186186
}

‎com.unity.multiplayer.mlapi/Runtime/Messaging/RpcQueue/RpcQueueContainer.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -251,12 +251,12 @@ public void AdvanceFrameHistory(QueueHistoryFrame.QueueFrameType queueType)
251251
if (queueType == QueueHistoryFrame.QueueFrameType.Inbound)
252252
{
253253
ProfilerStatManager.rpcInQueueSize.Record((int)queueHistoryItem.totalSize);
254-
PerformanceDataManager.Increment(ProfilerConstants.NumberOfRPCsInQueueSize, (int)queueHistoryItem.totalSize);
254+
PerformanceDataManager.Increment(ProfilerConstants.NumberOfRPCsInQueueSize.ToString(), (int)queueHistoryItem.totalSize);
255255
}
256256
else
257257
{
258258
ProfilerStatManager.rpcOutQueueSize.Record((int)queueHistoryItem.totalSize);
259-
PerformanceDataManager.Increment(ProfilerConstants.NumberOfRPCsOutQueueSize, (int)queueHistoryItem.totalSize);
259+
PerformanceDataManager.Increment(ProfilerConstants.NumberOfRPCsOutQueueSize.ToString(), (int)queueHistoryItem.totalSize);
260260
}
261261
}
262262

‎com.unity.multiplayer.mlapi/Runtime/Messaging/RpcQueue/RpcQueueProcessor.cs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ public void ProcessReceiveQueue(NetworkUpdateManager.NetworkUpdateStage currentS
6262

6363
NetworkingManager.InvokeRpc(currentQueueItem);
6464
ProfilerStatManager.rpcsQueueProc.Record();
65-
PerformanceDataManager.Increment(ProfilerConstants.NumberOfRPCQueueProcessed);
65+
PerformanceDataManager.Increment(ProfilerConstants.NumberOfRPCQueueProcessed.ToString());
6666
currentQueueItem = CurrentFrame.GetNextQueueItem();
6767
}
6868

@@ -131,7 +131,7 @@ public void InternalMessagesSendAndFlush()
131131
InternalMessageSender.Send(clientId, MLAPIConstants.MLAPI_ADD_OBJECT, queueItem.channel, PoolStream, queueItem.sendFlags);
132132
}
133133

134-
PerformanceDataManager.Increment(ProfilerConstants.NumberOfRPCsSent, queueItem.clientIds.Length);
134+
PerformanceDataManager.Increment(ProfilerConstants.NumberOfRPCsSent.ToString(), queueItem.clientIds.Length);
135135
ProfilerStatManager.rpcsSent.Record(queueItem.clientIds.Length);
136136
break;
137137
}
@@ -142,7 +142,7 @@ public void InternalMessagesSendAndFlush()
142142
InternalMessageSender.Send(clientId, MLAPIConstants.MLAPI_DESTROY_OBJECT, queueItem.channel, PoolStream, queueItem.sendFlags);
143143
}
144144

145-
PerformanceDataManager.Increment(ProfilerConstants.NumberOfRPCsSent, queueItem.clientIds.Length);
145+
PerformanceDataManager.Increment(ProfilerConstants.NumberOfRPCsSent.ToString(), queueItem.clientIds.Length);
146146
ProfilerStatManager.rpcsSent.Record(queueItem.clientIds.Length);
147147
break;
148148
}
@@ -232,8 +232,8 @@ private void SendFrameQueueItem(RpcFrameQueueItem queueItem)
232232

233233
//For each packet sent, we want to record how much data we have sent
234234

235-
PerformanceDataManager.Increment(ProfilerConstants.NumberBytesSent, (int)queueItem.streamSize);
236-
PerformanceDataManager.Increment(ProfilerConstants.NumberOfRPCsSent);
235+
PerformanceDataManager.Increment(ProfilerConstants.NumberBytesSent.ToString(), (int)queueItem.streamSize);
236+
PerformanceDataManager.Increment(ProfilerConstants.NumberOfRPCsSent.ToString());
237237
ProfilerStatManager.bytesSent.Record((int)queueItem.streamSize);
238238
ProfilerStatManager.rpcsSent.Record();
239239
break;
@@ -245,12 +245,12 @@ private void SendFrameQueueItem(RpcFrameQueueItem queueItem)
245245
NetworkingManager.Singleton.NetworkConfig.NetworkTransport.Send(clientid, queueItem.messageData, queueItem.channel);
246246

247247
//For each packet sent, we want to record how much data we have sent
248-
PerformanceDataManager.Increment(ProfilerConstants.NumberBytesSent, (int)queueItem.streamSize);
248+
PerformanceDataManager.Increment(ProfilerConstants.NumberBytesSent.ToString(), (int)queueItem.streamSize);
249249
ProfilerStatManager.bytesSent.Record((int)queueItem.streamSize);
250250
}
251251

252252
//For each client we send to, we want to record how many RPCs we have sent
253-
PerformanceDataManager.Increment(ProfilerConstants.NumberOfRPCsSent, queueItem.clientIds.Length);
253+
PerformanceDataManager.Increment(ProfilerConstants.NumberOfRPCsSent.ToString(), queueItem.clientIds.Length);
254254
ProfilerStatManager.rpcsSent.Record(queueItem.clientIds.Length);
255255

256256
break;

‎com.unity.multiplayer.mlapi/Runtime/Profiling/ITransportProfilerData.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ namespace MLAPI.Profiling
44
{
55
public interface ITransportProfilerData
66
{
7-
Dictionary<string, int> GetTransportGetData();
7+
IReadOnlyDictionary<string, int> GetTransportProfilerData();
88
}
99
}

‎com.unity.multiplayer.mlapi/Runtime/Profiling/PerformanceDataManager.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,25 +3,25 @@
33

44
namespace MLAPI.Profiling
55
{
6-
public static class PerformanceDataManager
6+
static class PerformanceDataManager
77
{
88
static PerformanceTickData s_ProfilerData;
99
static int s_TickID;
1010

11-
public static void BeginNewTick()
11+
internal static void BeginNewTick()
1212
{
1313
s_ProfilerData = new PerformanceTickData
1414
{
1515
tickID = s_TickID++,
1616
};
1717
}
1818

19-
public static void Increment(ProfilerConstants fieldName, int count = 1)
19+
internal static void Increment(string fieldName, int count = 1)
2020
{
2121
s_ProfilerData.Increment(fieldName, count);
2222
}
2323

24-
public static void AddTransportData(Dictionary<string, int> transportProfilerData)
24+
internal static void AddTransportData(IReadOnlyDictionary<string, int> transportProfilerData)
2525
{
2626
IEnumerable<KeyValuePair<string, int>> nonDuplicates = transportProfilerData.Where(entry => !s_ProfilerData.tickData.ContainsKey(entry.Key));
2727
foreach (KeyValuePair<string, int> entry in nonDuplicates)
@@ -30,7 +30,7 @@ public static void AddTransportData(Dictionary<string, int> transportProfilerDat
3030
}
3131
}
3232

33-
public static PerformanceTickData GetData()
33+
internal static PerformanceTickData GetData()
3434
{
3535
return s_ProfilerData;
3636
}

‎com.unity.multiplayer.mlapi/Runtime/Profiling/PerformanceTickData.cs‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,21 +8,19 @@ public class PerformanceTickData
88

99
public readonly Dictionary<string, int> tickData = new Dictionary<string, int>();
1010

11-
public void Increment(ProfilerConstants fieldName, int count = 1)
11+
public void Increment(string fieldName, int count = 1)
1212
{
13-
string fieldStr = fieldName.ToString();
14-
if (!tickData.ContainsKey(fieldStr))
13+
if (!tickData.ContainsKey(fieldName))
1514
{
16-
tickData[fieldStr] = 0;
15+
tickData[fieldName] = 0;
1716
}
1817

19-
tickData[fieldStr] += count;
18+
tickData[fieldName] += count;
2019
}
2120

22-
public int GetData(ProfilerConstants fieldName)
21+
public int GetData(string fieldName)
2322
{
24-
string fieldString = fieldName.ToString();
25-
return tickData.ContainsKey(fieldString) ? tickData[fieldString] : 0;
23+
return tickData.ContainsKey(fieldName) ? tickData[fieldName] : 0;
2624
}
2725
}
2826
}

0 commit comments

Comments
 (0)