WIP

Tracking down additional issues.

Author: NoelStephensUnity

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

@@ -737,14 +737,14 @@ public NetworkUpdateManager.NetworkUpdateLoopCallbackFunction RegisterUpdate(Net
         private void Awake()
         {
             //We always add the networking manager as the first entry
-            NetworkLoopUpdateSystems.Insert(0, this);
+            //NetworkLoopUpdateSystems.Insert(0, this);
 
             RpcQueueManager = new RPCQueueManager(LoopbackEnabled);
             //Note: Since frame history is not being used, this is set to 0
             //To test frame history, increase the number to (n) where n > 0
             RpcQueueManager?.Initialize(0);
 
-            NetworkUpdateManager.HandleNetworkLoopRegistrations(NetworkLoopUpdateSystems);
+            //NetworkUpdateManager.HandleNetworkLoopRegistrations(NetworkLoopUpdateSystems);
 
             NetworkUpdateManager.RegisterNetworkUpdateAction(NetworkPreUpdate, NetworkUpdateManager.NetworkUpdateStages.PREUPDATE);
             NetworkUpdateManager.RegisterNetworkUpdateAction(NetworkFixedUpdate, NetworkUpdateManager.NetworkUpdateStages.FIXEDUPDATE);
@@ -1267,7 +1267,7 @@ internal void HandleIncomingData(ulong clientId, string channelName, ArraySegmen
         public static void InvokeRpc(FrameQueueItem queueItem)
         {
 #if DEVELOPMENT_BUILD || UNITY_EDITOR
-            s_InvokeRPC.Begin();
+            //s_InvokeRPC.Begin();
 #endif
 
             var networkObjectId = queueItem.StreamReader.ReadUInt64Packed();
@@ -1296,7 +1296,7 @@ public static void InvokeRpc(FrameQueueItem queueItem)
             }
 
 #if DEVELOPMENT_BUILD || UNITY_EDITOR
-            s_InvokeRPC.End();
+            //s_InvokeRPC.End();
 #endif
         }
 

com.unity.multiplayer.mlapi/Runtime/Core/RPCQueue/RPCQueueHistoryFrame.cs

@@ -199,9 +199,32 @@ public FrameQueueItem GetFirstQueueItem()
 
                 if (queueFrameType == QueueFrameType.Inbound)
                 {
-                    CurrentQueueItem.ItemStream = PooledBitStream.Get();
-                    CurrentQueueItem.StreamWriter = PooledBitWriter.Get(CurrentQueueItem.ItemStream);
-                    CurrentQueueItem.StreamReader = PooledBitReader.Get(CurrentQueueItem.ItemStream);
+                    if(CurrentQueueItem.ItemStream == null)
+                    {
+                        CurrentQueueItem.ItemStream = PooledBitStream.Get();
+                    }
+                    else
+                    {
+                        UnityEngine.Debug.LogError("Current queue item already has a stream!");
+                    }
+                    if(CurrentQueueItem.StreamWriter == null)
+                    {
+                        CurrentQueueItem.StreamWriter = PooledBitWriter.Get(CurrentQueueItem.ItemStream);
+                    }
+                    else
+                    {
+                        UnityEngine.Debug.LogError("Current queue writer already has an instance!");
+                    }
+
+                    if(CurrentQueueItem.StreamReader == null)
+                    {
+                        CurrentQueueItem.StreamReader = PooledBitReader.Get(CurrentQueueItem.ItemStream);
+                    }
+                    else
+                    {
+                        UnityEngine.Debug.LogError("Current queue reader already has an instance!");
+                    }
+
                 }
 
                 return GetCurrentQueueItem();
@@ -235,7 +258,8 @@ public void CloseQueue()
 
             if (CurrentQueueItem.ItemStream != null)
             {
-                CurrentQueueItem.ItemStream.Dispose();
+               CurrentQueueItem.ItemStream.Dispose();
+
                 CurrentQueueItem.ItemStream = null;
             }
         }

com.unity.multiplayer.mlapi/Runtime/Core/RPCQueue/RPCQueueManager.cs

@@ -256,16 +256,19 @@ private static void ResetQueueHistoryFrame(QueueHistoryFrame queueFrame)
         internal void AddQueueItemToInboundFrame(QueueItemType qItemType, float timeStamp, ulong sourceNetworkId, BitStream message)
         {
             long originalPosition = message.Position;
-            BitReader BR = BitReaderPool.GetReader(message);
+            PooledBitReader BR = PooledBitReader.Get(message);
             //var byteValue = BR.ReadByte();         // MLAPI Proto Header (temporary, we reset position just below)
             var longValue = BR.ReadUInt64Packed(); // NetworkObjectId (temporary, we reset position just below)
 
             var shortValue = BR.ReadUInt16Packed(); // NetworkBehaviourId (temporary, we reset position just below)
             ushort updateStageValue = BR.ReadUInt16Packed();
-            if(longValue > 1111111 || shortValue > 111111)
+            if(longValue > 1111111 || shortValue > 11111)
             {
                 originalPosition = originalPosition;
             }
+            
+            BR.Dispose();
+            BR = null;
             NetworkUpdateManager.NetworkUpdateStages updateStage = NetworkUpdateManager.NetworkUpdateStages.UPDATE;
             if(System.Enum.IsDefined(typeof(NetworkUpdateManager.NetworkUpdateStages),(int)updateStageValue))
             {

com.unity.multiplayer.mlapi/Runtime/Core/RPCQueue/RPCQueueProcessing.cs

@@ -80,16 +80,17 @@ public static void ProcessReceiveQueue(NetworkUpdateManager.NetworkUpdateStages
         /// </summary>
         public void ProcessSendQueue()
         {
+            InternalMessagesSendAndFlush();
+
 #if DEVELOPMENT_BUILD || UNITY_EDITOR
             s_MLAPIRPCQueueSend.Begin();
 #endif
-
             RPCQueueSendAndFlush();
 
 #if DEVELOPMENT_BUILD || UNITY_EDITOR
             s_MLAPIRPCQueueSend.End();
 #endif
-            InternalMessagesSendAndFlush();
+
         }
 
         /// <summary>

com.unity.multiplayer.mlapi/Runtime/Serialization/Pooled/BitStreamPool.cs

@@ -9,10 +9,14 @@ namespace MLAPI.Serialization.Pooled
     /// </summary>
     public static class BitStreamPool
     {
-        private static byte createdStreams = 0;
+        private static uint createdStreams = 0;
         private static readonly Queue<WeakReference> overflowStreams = new Queue<WeakReference>();
         private static readonly Queue<PooledBitStream> streams = new Queue<PooledBitStream>();
 
+        private const uint MaxBitPoolStreams = 1024;
+        private const uint MaxCreatedDelta = 768;
+
+
         /// <summary>
         /// Retrieves an expandable PooledBitStream from the pool
         /// </summary>
@@ -38,12 +42,12 @@ public static PooledBitStream GetStream()
                         return strongStream;
                     }
                 }
-                
-                if (createdStreams == 254)
+
+                if (createdStreams == MaxBitPoolStreams)
                 {
-                    if (NetworkLog.CurrentLogLevel <= LogLevel.Normal) NetworkLog.LogWarning("255 streams have been created. Did you forget to dispose?");
+                    if (NetworkLog.CurrentLogLevel <= LogLevel.Normal) NetworkLog.LogWarning(MaxBitPoolStreams.ToString() + " streams have been created. Did you forget to dispose?");
                 }
-                else if (createdStreams < 255) createdStreams++;
+                else if (createdStreams < MaxBitPoolStreams) createdStreams++;
 
                 return new PooledBitStream();
             }
@@ -62,7 +66,7 @@ public static PooledBitStream GetStream()
         /// <param name="stream">The stream to put in the pool</param>
         public static void PutBackInPool(PooledBitStream stream)
         {
-            if (streams.Count > 16)
+            if (streams.Count > MaxCreatedDelta)
             {
                 // The user just created lots of streams without returning them in between.
                 // Streams are essentially byte array wrappers. This is valuable memory.

com.unity.multiplayer.mlapi/Runtime/Serialization/Pooled/PooledBitReader.cs

@@ -9,7 +9,7 @@ namespace MLAPI.Serialization.Pooled
     public sealed class PooledBitReader : BitReader, IDisposable
     {
         private bool isDisposed = false;
-        
+
         internal PooledBitReader(Stream stream) : base(stream)
         {
         }
@@ -35,6 +35,10 @@ public void Dispose()
                 isDisposed = true;
                 BitReaderPool.PutBackInPool(this);
             }
+            else
+            {
+                UnityEngine.Debug.LogWarning("Disposing reader that thinks it is already disposed!");
+            }
         }
     }
-}
+}

com.unity.multiplayer.mlapi/Runtime/Serialization/Pooled/PooledBitWriter.cs

@@ -35,6 +35,10 @@ public void Dispose()
                 isDisposed = true;
                 BitWriterPool.PutBackInPool(this);
             }
+            else
+            {
+                UnityEngine.Debug.LogError("Writer is being disposed but thinks it is already disposed");
+            }
         }
     }
 }

com.unity.multiplayer.mlapi/Runtime/Spawning/SpawnManager.cs

@@ -688,6 +688,7 @@ internal static void OnDestroyObject(ulong networkId, bool destroyGameObject)
                                 ClientIds = NetworkingManager.Singleton.ConnectedClientsList.Select(c => c.ClientId).ToArray()
                             };
                             rpcQueueManager.AddToInternalMLAPISendQueue(QueueItem);
+                            writer.Dispose();
                         }
                     }
                 }