GabrielTofvesson/MLAPI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed Generic MLAPI message header allocation

Browse Source
This commit is contained in:
Albin Corén 2018-04-17 21:46:22 +02:00
parent 554010dbbc
commit 39c262e9e0
2 changed files with 27 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
MLAPI/MonoBehaviours/Core/NetworkingManager.cs
View File

@ -234,6 +234,7 @@ namespace MLAPI.MonoBehaviours.Core
NetworkSceneManager.registeredSceneNames = new HashSet<string>(); NetworkSceneManager.registeredSceneNames = new HashSet<string>();
NetworkSceneManager.sceneIndexToString = new Dictionary<uint, string>(); NetworkSceneManager.sceneIndexToString = new Dictionary<uint, string>();
NetworkSceneManager.sceneNameToIndex = new Dictionary<string, uint>(); NetworkSceneManager.sceneNameToIndex = new Dictionary<string, uint>();
InternalMessageHandler.FinalMessageBuffer = new byte[NetworkConfig.MessageBufferSize];
if(NetworkConfig.HandleObjectSpawning) if(NetworkConfig.HandleObjectSpawning)
{ {

35
MLAPI/NetworkingManagerComponents/Core/InternalMessageHandler.Send.cs
View File

@ -1,5 +1,4 @@
using System; using System.Collections.Generic;
using System.Collections.Generic;
using MLAPI.Data; using MLAPI.Data;
using MLAPI.NetworkingManagerComponents.Binary; using MLAPI.NetworkingManagerComponents.Binary;
using MLAPI.NetworkingManagerComponents.Cryptography; using MLAPI.NetworkingManagerComponents.Cryptography;
@ -10,6 +9,7 @@ namespace MLAPI.NetworkingManagerComponents.Core
{ {
internal static partial class InternalMessageHandler internal static partial class InternalMessageHandler
{ {
internal static byte[] FinalMessageBuffer;
internal static void PassthroughSend(uint targetId, uint sourceId, ushort messageType, int channelId, byte[] data, uint? networkId = null, ushort? orderId = null) internal static void PassthroughSend(uint targetId, uint sourceId, ushort messageType, int channelId, byte[] data, uint? networkId = null, ushort? orderId = null)
{ {
NetId targetNetId = new NetId(targetId); NetId targetNetId = new NetId(targetId);
@ -41,8 +41,10 @@ namespace MLAPI.NetworkingManagerComponents.Core
else else
writer.WriteByteArray(data); writer.WriteByteArray(data);
writer.Finalize(ref FinalMessageBuffer);
byte error; byte error;
NetworkTransport.QueueMessageForSending(targetNetId.HostId, targetNetId.ConnectionId, channelId, writer.Finalize(), (int)writer.GetFinalizeSize(), out error); NetworkTransport.QueueMessageForSending(targetNetId.HostId, targetNetId.ConnectionId, channelId, FinalMessageBuffer, (int)writer.GetFinalizeSize(), out error);
} }
} }
@ -103,10 +105,13 @@ namespace MLAPI.NetworkingManagerComponents.Core
byte error; byte error;
if (isPassthrough) if (isPassthrough)
netId = NetId.ServerNetId; netId = NetId.ServerNetId;
writer.Finalize(ref FinalMessageBuffer);
if (skipQueue) if (skipQueue)
NetworkTransport.Send(netId.HostId, netId.ConnectionId, MessageManager.channels[channelName], writer.Finalize(), (int)writer.GetFinalizeSize(), out error); NetworkTransport.Send(netId.HostId, netId.ConnectionId, MessageManager.channels[channelName], FinalMessageBuffer, (int)writer.GetFinalizeSize(), out error);
else else
NetworkTransport.QueueMessageForSending(netId.HostId, netId.ConnectionId, MessageManager.channels[channelName], writer.Finalize(), (int)writer.GetFinalizeSize(), out error); NetworkTransport.QueueMessageForSending(netId.HostId, netId.ConnectionId, MessageManager.channels[channelName], FinalMessageBuffer, (int)writer.GetFinalizeSize(), out error);
} }
} }
@ -149,8 +154,11 @@ namespace MLAPI.NetworkingManagerComponents.Core
//Client trying to send data to host //Client trying to send data to host
netId = NetId.ServerNetId; netId = NetId.ServerNetId;
} }
writer.Finalize(ref FinalMessageBuffer);
byte error; byte error;
NetworkTransport.QueueMessageForSending(netId.HostId, netId.ConnectionId, channel, writer.Finalize(), (int)writer.GetFinalizeSize(), out error); NetworkTransport.QueueMessageForSending(netId.HostId, netId.ConnectionId, channel, FinalMessageBuffer, (int)writer.GetFinalizeSize(), out error);
} }
} }
} }
@ -194,8 +202,11 @@ namespace MLAPI.NetworkingManagerComponents.Core
//Client trying to send data to host //Client trying to send data to host
netId = NetId.ServerNetId; netId = NetId.ServerNetId;
} }
writer.Finalize(ref FinalMessageBuffer);
byte error; byte error;
NetworkTransport.QueueMessageForSending(netId.HostId, netId.ConnectionId, channel, writer.Finalize(), (int)writer.GetFinalizeSize(), out error); NetworkTransport.QueueMessageForSending(netId.HostId, netId.ConnectionId, channel, FinalMessageBuffer, (int)writer.GetFinalizeSize(), out error);
} }
} }
} }
@ -240,8 +251,11 @@ namespace MLAPI.NetworkingManagerComponents.Core
//Client trying to send data to host //Client trying to send data to host
netId = NetId.ServerNetId; netId = NetId.ServerNetId;
} }
writer.Finalize(ref FinalMessageBuffer);
byte error; byte error;
NetworkTransport.QueueMessageForSending(netId.HostId, netId.ConnectionId, channel, writer.Finalize(), (int)writer.GetFinalizeSize(), out error); NetworkTransport.QueueMessageForSending(netId.HostId, netId.ConnectionId, channel, FinalMessageBuffer, (int)writer.GetFinalizeSize(), out error);
} }
} }
} }
@ -288,8 +302,11 @@ namespace MLAPI.NetworkingManagerComponents.Core
//Client trying to send data to host //Client trying to send data to host
netId = NetId.ServerNetId; netId = NetId.ServerNetId;
} }
writer.Finalize(ref FinalMessageBuffer);
byte error; byte error;
NetworkTransport.QueueMessageForSending(netId.HostId, netId.ConnectionId, channel, writer.Finalize(), (int)writer.GetFinalizeSize(), out error); NetworkTransport.QueueMessageForSending(netId.HostId, netId.ConnectionId, channel, FinalMessageBuffer, (int)writer.GetFinalizeSize(), out error);
} }
} }
} }