improve refcount debug code

RevenantX · May 16, 2021 · e96bb61 · e96bb61
1 parent 30e86ce
commit e96bb61
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 16 deletions.
diff --git a/LiteNetLib/NetPacket.cs b/LiteNetLib/NetPacket.cs
@@ -128,7 +128,7 @@ public ushort FragmentsTotal
         public NetPacket Next;
 
 #if DEBUG_REFCOUNT
-        public int RefCount = 0;
+        public int RefCount = 1;
 #endif
 
         public NetPacket(int size)

diff --git a/LiteNetLib/NetPacketPool.cs b/LiteNetLib/NetPacketPool.cs
@@ -34,7 +34,7 @@ public NetPacket GetWithProperty(PacketProperty property)
 
         public NetPacket GetPacket(int size)
         {
-            if (size > NetConstants.MaxPacketSize) 
+            if (size > NetConstants.MaxPacketSize)
                 return new NetPacket(size);
 
             NetPacket packet;
@@ -46,15 +46,10 @@ public NetPacket GetPacket(int size)
             } while (packet != Interlocked.CompareExchange(ref _head, packet.Next, packet));
 
 #if DEBUG_REFCOUNT
-            if (Interlocked.Increment(ref packet.RefCount) > 1)
-            {
-                Interlocked.Decrement(ref packet.RefCount);
-                NetDebug.WriteError("PacketRefCount more than 1: {0}", Environment.StackTrace);
-                return new NetPacket(size);
-            }
+            Interlocked.Increment(ref packet.RefCount);
 #endif
 
-            _count--;
+            Interlocked.Decrement(ref _count);
             packet.Size = size;
             if (packet.RawData.Length < size)
                 packet.RawData = new byte[size];
@@ -69,20 +64,21 @@ public void Recycle(NetPacket packet)
                 return;
             }
 
-            _count++;
+#if DEBUG_REFCOUNT
+            int result = Interlocked.Decrement(ref packet.RefCount);
+            if (result != 0)
+                NetDebug.WriteError("PacketRefCount invalid: {0}, {1}", result, Environment.StackTrace);
+#endif
+
+            Interlocked.Increment(ref _count);
 
             //Clean fragmented flag
             packet.RawData[0] = 0;
 
-#if DEBUG_REFCOUNT
-            if (packet.RefCount > 0)
-                Interlocked.Decrement(ref packet.RefCount);
-#endif
-
             do
             {
                 packet.Next = _head;
             } while (packet.Next != Interlocked.CompareExchange(ref _head, packet, packet.Next));
         }
     }
-}
+}