Skip to content

refactor!: remove NetworkChannel and MultiplexTransportAdapter #1133

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 16 commits into from
Sep 3, 2021
Merged

refactor!: remove NetworkChannel and MultiplexTransportAdapter #1133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
3787cb0
cleanup NetworkTransport API
0xFA11 Sep 2, 2021
94177f8
polish NetworkTransport API
0xFA11 Sep 2, 2021
8e21384
port UNetTransport
0xFA11 Sep 2, 2021
90eecc5
kill MultiplexTransportAdapter
0xFA11 Sep 2, 2021
411cd5c
kill TransportChannel
0xFA11 Sep 2, 2021
a2a95f8
NetworkVariableChannel -> Delivery
0xFA11 Sep 2, 2021
d0ef70c
update IInternalMessageHandler interface
0xFA11 Sep 2, 2021
b52c541
kill NetworkChannel around the codebase
0xFA11 Sep 2, 2021
93fa014
merge branch 'develop' into 'refactor/kill-channels'
0xFA11 Sep 2, 2021
36a85b8
fix MessageQueueContainer
0xFA11 Sep 2, 2021
48c5c04
update NetworkVariableBase constructor (make NetworkDelivery of Netwo…
0xFA11 Sep 2, 2021
81d56b1
minor grammar fix
0xFA11 Sep 2, 2021
2393f99
revert to NetworkVariable.Delivery being an internal const
0xFA11 Sep 2, 2021
df1d786
remove channels from UTPTransport
0xFA11 Sep 3, 2021
0c9f76b
Merge branch 'develop' into refactor/kill-channels
0xFA11 Sep 3, 2021
0a965e6
`./standards.py --fix`
0xFA11 Sep 3, 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
269 changes: 117 additions & 152 deletions com.unity.multiplayer.transport.utp/Runtime/UTPTransport.cs
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion com.unity.multiplayer.transport.utp/Tests/Editor/BasicUTPTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ public void BasicUTPInitializationTest()
{
var o = new GameObject();
var utpTransport = (UTPTransport)o.AddComponent(typeof(UTPTransport));
utpTransport.Init();
utpTransport.Initialize();

Assert.True(utpTransport.ServerClientId == 0);

Expand Down
45 changes: 22 additions & 23 deletions com.unity.netcode.gameobjects/Runtime/Core/NetworkBehaviour.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,16 +64,16 @@ internal NetworkSerializer __beginSendServerRpc(uint rpcMethodId, ServerRpcParam
}

var messageQueueContainer = NetworkManager.MessageQueueContainer;
var transportChannel = rpcDelivery == RpcDelivery.Reliable ? NetworkChannel.ReliableRpc : NetworkChannel.UnreliableRpc;
var networkDelivery = rpcDelivery == RpcDelivery.Reliable ? NetworkDelivery.ReliableSequenced : NetworkDelivery.UnreliableSequenced;

if (IsHost)
{
writer = messageQueueContainer.BeginAddQueueItemToFrame(MessageQueueContainer.MessageType.ServerRpc, Time.realtimeSinceStartup, transportChannel,
writer = messageQueueContainer.BeginAddQueueItemToFrame(MessageQueueContainer.MessageType.ServerRpc, Time.realtimeSinceStartup, networkDelivery,
NetworkManager.ServerClientId, null, MessageQueueHistoryFrame.QueueFrameType.Inbound, serverRpcParams.Send.UpdateStage);
}
else
{
writer = messageQueueContainer.BeginAddQueueItemToFrame(MessageQueueContainer.MessageType.ServerRpc, Time.realtimeSinceStartup, transportChannel,
writer = messageQueueContainer.BeginAddQueueItemToFrame(MessageQueueContainer.MessageType.ServerRpc, Time.realtimeSinceStartup, networkDelivery,
NetworkManager.ServerClientId, null, MessageQueueHistoryFrame.QueueFrameType.Outbound, NetworkUpdateStage.PostLateUpdate);

writer.WriteByte((byte)MessageQueueContainer.MessageType.ServerRpc);
Expand Down Expand Up @@ -133,7 +133,7 @@ internal NetworkSerializer __beginSendClientRpc(uint rpcMethodId, ClientRpcParam
}

// This will start a new queue item entry and will then return the writer to the current frame's stream
var transportChannel = rpcDelivery == RpcDelivery.Reliable ? NetworkChannel.ReliableRpc : NetworkChannel.UnreliableRpc;
var networkDelivery = rpcDelivery == RpcDelivery.Reliable ? NetworkDelivery.ReliableSequenced : NetworkDelivery.UnreliableSequenced;

ulong[] clientIds = clientRpcParams.Send.TargetClientIds ?? NetworkManager.ConnectedClientsIds;
if (clientRpcParams.Send.TargetClientIds != null && clientRpcParams.Send.TargetClientIds.Length == 0)
Expand All @@ -151,7 +151,7 @@ internal NetworkSerializer __beginSendClientRpc(uint rpcMethodId, ClientRpcParam
if (IsHost && containsServerClientId)
{
//Always write to the next frame's inbound queue
writer = messageQueueContainer.BeginAddQueueItemToFrame(MessageQueueContainer.MessageType.ClientRpc, Time.realtimeSinceStartup, transportChannel,
writer = messageQueueContainer.BeginAddQueueItemToFrame(MessageQueueContainer.MessageType.ClientRpc, Time.realtimeSinceStartup, networkDelivery,
NetworkManager.ServerClientId, null, MessageQueueHistoryFrame.QueueFrameType.Inbound, clientRpcParams.Send.UpdateStage);

//Handle sending to the other clients, if so the above notes explain why this code is here (a temporary patch-fix)
Expand All @@ -161,7 +161,7 @@ internal NetworkSerializer __beginSendClientRpc(uint rpcMethodId, ClientRpcParam
messageQueueContainer.SetLoopBackFrameItem(clientRpcParams.Send.UpdateStage);

//Switch to the outbound queue
writer = messageQueueContainer.BeginAddQueueItemToFrame(MessageQueueContainer.MessageType.ClientRpc, Time.realtimeSinceStartup, transportChannel, NetworkObjectId,
writer = messageQueueContainer.BeginAddQueueItemToFrame(MessageQueueContainer.MessageType.ClientRpc, Time.realtimeSinceStartup, networkDelivery, NetworkObjectId,
clientIds, MessageQueueHistoryFrame.QueueFrameType.Outbound, NetworkUpdateStage.PostLateUpdate);
}
else
Expand All @@ -171,7 +171,7 @@ internal NetworkSerializer __beginSendClientRpc(uint rpcMethodId, ClientRpcParam
}
else
{
writer = messageQueueContainer.BeginAddQueueItemToFrame(MessageQueueContainer.MessageType.ClientRpc, Time.realtimeSinceStartup, transportChannel, NetworkObjectId,
writer = messageQueueContainer.BeginAddQueueItemToFrame(MessageQueueContainer.MessageType.ClientRpc, Time.realtimeSinceStartup, networkDelivery, NetworkObjectId,
clientIds, MessageQueueHistoryFrame.QueueFrameType.Outbound, NetworkUpdateStage.PostLateUpdate);
}

Expand Down Expand Up @@ -364,8 +364,8 @@ public virtual void OnNetworkObjectParentChanged(NetworkObject parentNetworkObje

private bool m_VarInit = false;

private readonly List<HashSet<int>> m_ChannelMappedNetworkVariableIndexes = new List<HashSet<int>>();
private readonly List<NetworkChannel> m_ChannelsForNetworkVariableGroups = new List<NetworkChannel>();
private readonly List<HashSet<int>> m_DeliveryMappedNetworkVariableIndices = new List<HashSet<int>>();
private readonly List<NetworkDelivery> m_DeliveryTypesForNetworkVariableGroups = new List<NetworkDelivery>();
internal readonly List<NetworkVariableBase> NetworkVariableFields = new List<NetworkVariableBase>();

private static Dictionary<Type, FieldInfo[]> s_FieldTypes = new Dictionary<Type, FieldInfo[]>();
Expand Down Expand Up @@ -436,27 +436,26 @@ internal void InitializeVariables()
}

{
// Create index map for channels
var firstLevelIndex = new Dictionary<NetworkChannel, int>();
// Create index map for delivery types
var firstLevelIndex = new Dictionary<NetworkDelivery, int>();
int secondLevelCounter = 0;

for (int i = 0; i < NetworkVariableFields.Count; i++)
{
var networkChannel = NetworkVariableBase.NetworkVariableChannel;

if (!firstLevelIndex.ContainsKey(networkChannel))
var networkDelivery = NetworkVariableBase.Delivery;
if (!firstLevelIndex.ContainsKey(networkDelivery))
{
firstLevelIndex.Add(networkChannel, secondLevelCounter);
m_ChannelsForNetworkVariableGroups.Add(networkChannel);
firstLevelIndex.Add(networkDelivery, secondLevelCounter);
m_DeliveryTypesForNetworkVariableGroups.Add(networkDelivery);
secondLevelCounter++;
}

if (firstLevelIndex[networkChannel] >= m_ChannelMappedNetworkVariableIndexes.Count)
if (firstLevelIndex[networkDelivery] >= m_DeliveryMappedNetworkVariableIndices.Count)
{
m_ChannelMappedNetworkVariableIndexes.Add(new HashSet<int>());
m_DeliveryMappedNetworkVariableIndices.Add(new HashSet<int>());
}

m_ChannelMappedNetworkVariableIndexes[firstLevelIndex[networkChannel]].Add(i);
m_DeliveryMappedNetworkVariableIndices[firstLevelIndex[networkDelivery]].Add(i);
}
}
}
Expand Down Expand Up @@ -508,7 +507,7 @@ private void NetworkVariableUpdate(ulong clientId, int behaviourIndex)

if (!NetworkManager.NetworkConfig.UseSnapshotDelta)
{
for (int j = 0; j < m_ChannelMappedNetworkVariableIndexes.Count; j++)
for (int j = 0; j < m_DeliveryMappedNetworkVariableIndices.Count; j++)
{
using var buffer = PooledNetworkBuffer.Get();
using var writer = PooledNetworkWriter.Get(buffer);
Expand All @@ -521,9 +520,9 @@ private void NetworkVariableUpdate(ulong clientId, int behaviourIndex)
var writtenAny = false;
for (int k = 0; k < NetworkVariableFields.Count; k++)
{
if (!m_ChannelMappedNetworkVariableIndexes[j].Contains(k))
if (!m_DeliveryMappedNetworkVariableIndices[j].Contains(k))
{
// This var does not belong to the currently iterating channel group.
// This var does not belong to the currently iterating delivery group.
if (NetworkManager.NetworkConfig.EnsureNetworkVariableLengthSafety)
{
writer.WriteUInt16Packed(0);
Expand Down Expand Up @@ -590,7 +589,7 @@ private void NetworkVariableUpdate(ulong clientId, int behaviourIndex)
if (writtenAny)
{
var context = NetworkManager.MessageQueueContainer.EnterInternalCommandContext(
MessageQueueContainer.MessageType.NetworkVariableDelta, m_ChannelsForNetworkVariableGroups[j],
MessageQueueContainer.MessageType.NetworkVariableDelta, m_DeliveryTypesForNetworkVariableGroups[j],
new[] { clientId }, NetworkUpdateLoop.UpdateStage);
if (context != null)
{
Expand Down
Loading