Skip to content

Commit 354e373

Browse files
jeffreyrainyjakobbbb
jeffreyrainy
authored and
jakobbbb
committed
style: fixing the 'tools' part of the SDK to pass standards checks. (Unity-Technologies#2177)
1 parent fb94ca8 commit 354e373

13 files changed

Lines changed: 38 additions & 55 deletions

‎com.unity.netcode.gameobjects/Runtime/Metrics/NetworkMetrics.cs‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,14 @@
55
using Unity.Multiplayer.Tools.MetricTypes;
66
using Unity.Multiplayer.Tools.NetStats;
77
using Unity.Profiling;
8-
using UnityEngine;
98

109
namespace Unity.Netcode
1110
{
1211
internal class NetworkMetrics : INetworkMetrics
1312
{
14-
const ulong k_MaxMetricsPerFrame = 1000L;
15-
16-
static Dictionary<uint, string> s_SceneEventTypeNames;
17-
18-
static ProfilerMarker s_FrameDispatch = new ProfilerMarker($"{nameof(NetworkMetrics)}.DispatchFrame");
13+
private const ulong k_MaxMetricsPerFrame = 1000L;
14+
private static Dictionary<uint, string> s_SceneEventTypeNames;
15+
private static ProfilerMarker s_FrameDispatch = new ProfilerMarker($"{nameof(NetworkMetrics)}.DispatchFrame");
1916

2017
static NetworkMetrics()
2118
{
@@ -531,7 +528,7 @@ private static NetworkObjectIdentifier GetObjectIdentifier(NetworkObject network
531528
}
532529
}
533530

534-
internal class NetcodeObserver
531+
internal class NetcodeObserver
535532
{
536533
public static IMetricObserver Observer { get; } = MetricObserverFactory.Construct();
537534
}

‎com.unity.netcode.gameobjects/Runtime/Metrics/NetworkObjectProvider.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
namespace Unity.Netcode
66
{
7-
class NetworkObjectProvider : INetworkObjectProvider
7+
internal class NetworkObjectProvider : INetworkObjectProvider
88
{
99
private readonly NetworkManager m_NetworkManager;
1010

@@ -15,7 +15,7 @@ public NetworkObjectProvider(NetworkManager networkManager)
1515

1616
public Object GetNetworkObject(ulong networkObjectId)
1717
{
18-
if(m_NetworkManager.SpawnManager.SpawnedObjects.TryGetValue(networkObjectId, out NetworkObject value))
18+
if (m_NetworkManager.SpawnManager.SpawnedObjects.TryGetValue(networkObjectId, out NetworkObject value))
1919
{
2020
return value;
2121
}

‎com.unity.netcode.gameobjects/Runtime/Transports/UTP/NetworkMetricsPipelineStage.cs‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,25 +4,24 @@
44
using Unity.Burst;
55
using Unity.Collections.LowLevel.Unsafe;
66
using Unity.Networking.Transport;
7-
using UnityEngine;
87

98
namespace Unity.Netcode.Transports.UTP
109
{
1110
[BurstCompile]
1211
internal unsafe struct NetworkMetricsPipelineStage : INetworkPipelineStage
1312
{
14-
static TransportFunctionPointer<NetworkPipelineStage.ReceiveDelegate> ReceiveFunction = new TransportFunctionPointer<NetworkPipelineStage.ReceiveDelegate>(Receive);
15-
static TransportFunctionPointer<NetworkPipelineStage.SendDelegate> SendFunction = new TransportFunctionPointer<NetworkPipelineStage.SendDelegate>(Send);
16-
static TransportFunctionPointer<NetworkPipelineStage.InitializeConnectionDelegate> InitializeConnectionFunction = new TransportFunctionPointer<NetworkPipelineStage.InitializeConnectionDelegate>(InitializeConnection);
13+
private static TransportFunctionPointer<NetworkPipelineStage.ReceiveDelegate> s_ReceiveFunction = new TransportFunctionPointer<NetworkPipelineStage.ReceiveDelegate>(Receive);
14+
private static TransportFunctionPointer<NetworkPipelineStage.SendDelegate> s_SendFunction = new TransportFunctionPointer<NetworkPipelineStage.SendDelegate>(Send);
15+
private static TransportFunctionPointer<NetworkPipelineStage.InitializeConnectionDelegate> s_InitializeConnectionFunction = new TransportFunctionPointer<NetworkPipelineStage.InitializeConnectionDelegate>(InitializeConnection);
1716

1817
public NetworkPipelineStage StaticInitialize(byte* staticInstanceBuffer,
1918
int staticInstanceBufferLength,
2019
NetworkSettings settings)
2120
{
2221
return new NetworkPipelineStage(
23-
ReceiveFunction,
24-
SendFunction,
25-
InitializeConnectionFunction,
22+
s_ReceiveFunction,
23+
s_SendFunction,
24+
s_InitializeConnectionFunction,
2625
ReceiveCapacity: 0,
2726
SendCapacity: 0,
2827
HeaderCapacity: 0,

‎com.unity.netcode.gameobjects/Runtime/Transports/UTP/UnityTransport.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -895,7 +895,7 @@ private void ExtractNetworkMetrics()
895895

896896
private void ExtractNetworkMetricsForClient(ulong transportClientId)
897897
{
898-
var networkConnection = ParseClientId(transportClientId);
898+
var networkConnection = ParseClientId(transportClientId);
899899
ExtractNetworkMetricsFromPipeline(m_UnreliableFragmentedPipeline, networkConnection);
900900
ExtractNetworkMetricsFromPipeline(m_UnreliableSequencedFragmentedPipeline, networkConnection);
901901
ExtractNetworkMetricsFromPipeline(m_ReliableSequencedPipeline, networkConnection);
@@ -1391,7 +1391,7 @@ public void CreateDriver(UnityTransport transport, out NetworkDriver driver,
13911391
, typeof(SimulatorPipelineStageInSend)
13921392
#endif
13931393
#if MULTIPLAYER_TOOLS_1_0_0_PRE_7
1394-
,typeof(NetworkMetricsPipelineStage)
1394+
, typeof(NetworkMetricsPipelineStage)
13951395
#endif
13961396
);
13971397
reliableSequencedPipeline = driver.CreatePipeline(
@@ -1401,7 +1401,7 @@ public void CreateDriver(UnityTransport transport, out NetworkDriver driver,
14011401
, typeof(SimulatorPipelineStageInSend)
14021402
#endif
14031403
#if MULTIPLAYER_TOOLS_1_0_0_PRE_7
1404-
,typeof(NetworkMetricsPipelineStage)
1404+
, typeof(NetworkMetricsPipelineStage)
14051405
#endif
14061406
);
14071407
}
@@ -1411,20 +1411,20 @@ public void CreateDriver(UnityTransport transport, out NetworkDriver driver,
14111411
unreliableFragmentedPipeline = driver.CreatePipeline(
14121412
typeof(FragmentationPipelineStage)
14131413
#if MULTIPLAYER_TOOLS_1_0_0_PRE_7
1414-
,typeof(NetworkMetricsPipelineStage)
1414+
, typeof(NetworkMetricsPipelineStage)
14151415
#endif
14161416
);
14171417
unreliableSequencedFragmentedPipeline = driver.CreatePipeline(
14181418
typeof(FragmentationPipelineStage),
14191419
typeof(UnreliableSequencedPipelineStage)
14201420
#if MULTIPLAYER_TOOLS_1_0_0_PRE_7
1421-
,typeof(NetworkMetricsPipelineStage)
1421+
, typeof(NetworkMetricsPipelineStage)
14221422
#endif
14231423
);
14241424
reliableSequencedPipeline = driver.CreatePipeline(
14251425
typeof(ReliableSequencedPipelineStage)
14261426
#if MULTIPLAYER_TOOLS_1_0_0_PRE_7
1427-
,typeof(NetworkMetricsPipelineStage)
1427+
, typeof(NetworkMetricsPipelineStage)
14281428
#endif
14291429
);
14301430
}

‎com.unity.netcode.gameobjects/TestHelpers/Runtime/Metrics/WaitForEventMetricValues.cs‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,18 @@
11
#if MULTIPLAYER_TOOLS
2-
using System;
3-
using System.Collections;
42
using System.Collections.Generic;
5-
using System.Diagnostics;
63
using System.Linq;
7-
using NUnit.Framework;
84
using Unity.Multiplayer.Tools.MetricTypes;
95
using Unity.Multiplayer.Tools.NetStats;
106

117
namespace Unity.Netcode.TestHelpers.Runtime.Metrics
128
{
139
internal class WaitForEventMetricValues<TMetric> : WaitForMetricValues<TMetric>
1410
{
15-
IReadOnlyCollection<TMetric> m_EventValues;
11+
private IReadOnlyCollection<TMetric> m_EventValues;
1612

1713
public delegate bool EventFilter(TMetric metric);
18-
EventFilter m_EventFilterDelegate;
14+
15+
private EventFilter m_EventFilterDelegate;
1916

2017
public WaitForEventMetricValues(IMetricDispatcher dispatcher, DirectionalMetricInfo directionalMetricName)
2118
: base(dispatcher, directionalMetricName)

‎com.unity.netcode.gameobjects/Tests/Editor/Metrics/NetworkMetricsRegistrationTests.cs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,13 @@ namespace Unity.Netcode.EditorTests.Metrics
1010
{
1111
public class NetworkMetricsRegistrationTests
1212
{
13-
static Type[] s_MetricTypes = AppDomain.CurrentDomain.GetAssemblies()
13+
private static Type[] s_MetricTypes = AppDomain.CurrentDomain.GetAssemblies()
1414
.SelectMany(x => x.GetTypes())
1515
.Where(x => x.GetInterfaces().Contains(typeof(INetworkMetricEvent)))
1616
.ToArray();
1717

18-
[TestCaseSource(nameof(s_MetricTypes))][Ignore("Disable test while we reevaluate the assumption that INetworkMetricEvent interfaces must be reported from MLAPI.")]
18+
[TestCaseSource(nameof(s_MetricTypes))]
19+
[Ignore("Disable test while we reevaluate the assumption that INetworkMetricEvent interfaces must be reported from MLAPI.")]
1920
public void ValidateThatAllMetricTypesAreRegistered(Type metricType)
2021
{
2122
var dispatcher = new NetworkMetrics().Dispatcher as MetricDispatcher;

‎com.unity.netcode.gameobjects/Tests/Runtime/Metrics/ConnectionMetricsTests.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
#if MULTIPLAYER_TOOLS_1_0_0_PRE_7
33

44
using System.Collections;
5-
using System.Collections.Generic;
65
using NUnit.Framework;
76
using Unity.Multiplayer.Tools.MetricTypes;
87
using Unity.Netcode.TestHelpers.Runtime;

‎com.unity.netcode.gameobjects/Tests/Runtime/Metrics/MetricsDispatchTests.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
using Unity.Multiplayer.Tools.NetStats;
66
using UnityEngine.TestTools;
77
using Unity.Netcode.TestHelpers.Runtime;
8-
using Unity.Netcode.TestHelpers.Runtime.Metrics;
98

109
namespace Unity.Netcode.RuntimeTests.Metrics
1110
{

‎com.unity.netcode.gameobjects/Tests/Runtime/Metrics/OwnershipChangeMetricsTests.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
#if MULTIPLAYER_TOOLS
2-
using System;
32
using System.Collections;
43
using System.Linq;
54
using NUnit.Framework;
@@ -36,7 +35,7 @@ protected override void OnServerAndClientsCreated()
3635
private NetworkObject SpawnNetworkObject()
3736
{
3837
// Spawn another network object so we can hide multiple.
39-
var gameObject = UnityEngine.Object.Instantiate(m_NewNetworkPrefab); // new GameObject(NewNetworkObjectName);
38+
var gameObject = Object.Instantiate(m_NewNetworkPrefab); // new GameObject(NewNetworkObjectName);
4039
var networkObject = gameObject.GetComponent<NetworkObject>();
4140
networkObject.NetworkManagerOwner = Server;
4241
networkObject.Spawn();

‎com.unity.netcode.gameobjects/Tests/Runtime/Metrics/PacketLossMetricsTests.cs‎

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
11
#if MULTIPLAYER_TOOLS
22
#if MULTIPLAYER_TOOLS_1_0_0_PRE_7
33

4-
using System;
54
using System.Collections;
65
using NUnit.Framework;
76
using Unity.Collections;
87
using Unity.Multiplayer.Tools.MetricTypes;
98
using Unity.Netcode.TestHelpers.Runtime;
109
using Unity.Netcode.TestHelpers.Runtime.Metrics;
1110
using Unity.Netcode.Transports.UTP;
12-
using UnityEngine;
1311
using UnityEngine.TestTools;
1412

1513
namespace Unity.Netcode.RuntimeTests.Metrics
@@ -22,7 +20,7 @@ public class PacketLossMetricsTests : NetcodeIntegrationTest
2220

2321
public PacketLossMetricsTests()
2422
: base(HostOrServer.Server)
25-
{}
23+
{ }
2624

2725
protected override void OnServerAndClientsCreated()
2826
{
@@ -41,11 +39,9 @@ public IEnumerator TrackPacketLossAsServer()
4139

4240
for (int i = 0; i < 1000; ++i)
4341
{
44-
using (var writer = new FastBufferWriter(sizeof(byte), Allocator.Persistent))
45-
{
46-
writer.WriteByteSafe(42);
47-
m_ServerNetworkManager.CustomMessagingManager.SendNamedMessage("Test", m_ServerNetworkManager.ConnectedClientsIds, writer);
48-
}
42+
using var writer = new FastBufferWriter(sizeof(byte), Allocator.Persistent);
43+
writer.WriteByteSafe(42);
44+
m_ServerNetworkManager.CustomMessagingManager.SendNamedMessage("Test", m_ServerNetworkManager.ConnectedClientsIds, writer);
4945
}
5046

5147
yield return waitForPacketLossMetric.WaitForMetricsReceived();
@@ -60,7 +56,7 @@ public IEnumerator TrackPacketLossAsServer()
6056
#endif
6157
public IEnumerator TrackPacketLossAsClient()
6258
{
63-
double packetLossRateMinRange = (m_PacketLossRate-m_PacketLossRangeDelta) / 100d;
59+
double packetLossRateMinRange = (m_PacketLossRate - m_PacketLossRangeDelta) / 100d;
6460
double packetLossRateMaxrange = (m_PacketLossRate + m_PacketLossRangeDelta) / 100d;
6561
var clientNetworkManager = m_ClientNetworkManagers[0];
6662
var waitForPacketLossMetric = new WaitForGaugeMetricValues((clientNetworkManager.NetworkMetrics as NetworkMetrics).Dispatcher,
@@ -69,11 +65,9 @@ public IEnumerator TrackPacketLossAsClient()
6965

7066
for (int i = 0; i < 1000; ++i)
7167
{
72-
using (var writer = new FastBufferWriter(sizeof(byte), Allocator.Persistent))
73-
{
74-
writer.WriteByteSafe(42);
75-
m_ServerNetworkManager.CustomMessagingManager.SendNamedMessage("Test", m_ServerNetworkManager.ConnectedClientsIds, writer);
76-
}
68+
using var writer = new FastBufferWriter(sizeof(byte), Allocator.Persistent);
69+
writer.WriteByteSafe(42);
70+
m_ServerNetworkManager.CustomMessagingManager.SendNamedMessage("Test", m_ServerNetworkManager.ConnectedClientsIds, writer);
7771
}
7872

7973
yield return waitForPacketLossMetric.WaitForMetricsReceived();

0 commit comments

Comments
 (0)