Strip back some logging

jacksonrakena · Dec 11, 2023 · bd593de · bd593de
1 parent b1f020d
commit bd593de
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 14 deletions.
diff --git a/Common/Networking/Channels/ReliableChannel.cs b/Common/Networking/Channels/ReliableChannel.cs
@@ -323,7 +323,7 @@ public override async Task<bool> HandlePacketAsync(NetworkPacket packet)
             //detailed check
             if (seq == _remoteSequence)
             {
-                Peer.LogDebug($"Reliable packet of type {packet.Property} ({packet.Data.Count} bytes) received successfully");
+                Peer.LogDebug($"[Receive] {packet.Property} ({packet.Data.Count} bytes)");
                 await Peer.AddReliablePacket(_deliveryMethod, packet);
                 _remoteSequence = (_remoteSequence + 1) % NetConstants.MaxSequence;
 

diff --git a/Common/Networking/Core/PromulManager.cs b/Common/Networking/Core/PromulManager.cs
@@ -731,8 +731,6 @@ public async Task<bool> SendConnectionlessMessageAsync(ArraySegment<byte> data,
         /// <param name="sendDisconnectMessages">Whether to notify peers of pending disconnection.</param>
         public async Task StopAsync(bool sendDisconnectMessages = true)
         {
-            NetDebug.Write("[Control] Stopping.");
-
 #if UNITY_2018_3_OR_NEWER
             _pausedSocketFix.Deinitialize();
             _pausedSocketFix = null;

diff --git a/Common/Networking/Peers/PeerBase.cs b/Common/Networking/Peers/PeerBase.cs
@@ -330,10 +330,7 @@ private async Task SendInternal(
                 property = PacketProperty.Channeled;
                 channel = CreateChannel((byte)(channelNumber * NetConstants.ChannelTypeCount + (byte)deliveryMethod));
             }
-
-            //Prepare
-            LogDebug($"{property} channel message queued ({data.Count} bytes, {deliveryMethod:G})");
-
+
             //Check fragmentation
             int headerSize = NetworkPacket.GetHeaderSize(property);
             //Save mtu for multithread
@@ -460,7 +457,6 @@ internal async Task<ShutdownResult> ShutdownAsync(ArraySegment<byte> data, bool
                     data.CopyTo(_shutdownPacket.Data.Array,_shutdownPacket.Data.Offset+9);
                 }
                 ConnectionState = ConnectionState.ShutdownRequested;
-                NetDebug.Write("[Peer] Send disconnect");
                 await PromulManager.RawSendAsync(_shutdownPacket, EndPoint);
                 return result;
             }
@@ -612,7 +608,6 @@ internal async Task ProcessPacket(NetworkPacket packet)
                     {
                         FastBitConverter.GetBytes(_pongPacket.Data.Array, _pongPacket.Data.Offset+3, DateTime.UtcNow.Ticks);
                         _pongPacket.Sequence = packet.Sequence;
-                        LogDebug($"[PING] Received ping #{packet.Sequence}. Sending pong.");
                         await PromulManager.RawSendAsync(_pongPacket, EndPoint);
                     }
                     break;
@@ -624,7 +619,6 @@ internal async Task ProcessPacket(NetworkPacket packet)
                         RemoteTimeDelta = BitConverter.ToInt64(packet.Data[3..]) + (elapsedMs * TimeSpan.TicksPerMillisecond ) / 2 - DateTime.UtcNow.Ticks;
                         UpdateRoundTripTime(elapsedMs);
                         await PromulManager.ConnectionLatencyUpdated(this, elapsedMs / 2);
-                        LogDebug($"[PING] Received pong #{packet.Sequence}. Time: {elapsedMs}ms. Delta time: {RemoteTimeDelta}");
                     }
                     break;
                 case PacketProperty.Ack:
@@ -664,7 +658,7 @@ internal async Task SendUserData(NetworkPacket packet)
             //if (mergedPacketSize + splitThreshold >= MaximumTransferUnit)
             //{
                 await PromulManager.RawSendAsync(packet, EndPoint);
-                LogDebug($"[Send] Sent {packet.Data.Count} bytes with type {packet.Property}.");
+                LogDebug($"[Send] {packet.Property} ({packet.Data.Count} bytes)");
                 return;
             //}
             // if (_mergePos + mergedPacketSize > MaximumTransferUnit) await SendMerged();
@@ -758,7 +752,6 @@ internal async Task Update(long deltaTime)
             _pingSendTimer += deltaTime;
             if (_pingSendTimer >= PromulManager.PingInterval)
             {
-                LogDebug($"[PING] Sending regular ping #{_pingPacket.Sequence+1}");
                 _pingSendTimer = 0;
                 _pingPacket.Sequence++;
                 if (_pingTimer.IsRunning) UpdateRoundTripTime((int)_pingTimer.ElapsedMilliseconds);

diff --git a/Tests~/NetworkCoreTests/ConcurrentLoadTests.cs b/Tests~/NetworkCoreTests/ConcurrentLoadTests.cs
@@ -61,6 +61,7 @@ public async Task Test_Data_Load([Range(1,20)] int nClients,
             if (receivedMethod == method && buffer.SequenceEqual(readbuf))
             {
                 Interlocked.Decrement(ref remainingClients);
+                Console.WriteLine($"== REMAINING CLIENTS: {remainingClients}");
             }
         };
         foreach (var c in Enumerable.Range(0, nClients))

diff --git a/Tests~/RelayTests/RelayTests.cs b/Tests~/RelayTests/RelayTests.cs
@@ -73,7 +73,7 @@ private RelayPair Generate(int from, int to)
         return new RelayPair(from, to, buf);
     }
     [Test]
-    public async Task Test_Message_Relays([Range(2, 100)] int nRelayClients)
+    public async Task Test_Message_Relays([Values(2,3,4,5,6,7,8,9,10,25,50,75,100)] int nRelayClients)
     {
         var nMessages = nRelayClients*2;
         var sessionId = Guid.NewGuid().ToString();
@@ -102,6 +102,7 @@ public async Task Test_Message_Relays([Range(2, 100)] int nRelayClients)
         }
 
         var receivedMessagePairs = new ConcurrentBag<RelayPair>();
+        var nReceivedMessagePairs = 0;
 
         Console.WriteLine("Message pairs:");
         foreach (var mp in messagePairs)
@@ -148,8 +149,9 @@ public async Task Test_Message_Relays([Range(2, 100)] int nRelayClients)
                             if (mp.Data.SequenceEqual(control.Data))
                             {
                                 receivedMessagePairs.Add(mp);
+                                Interlocked.Increment(ref nReceivedMessagePairs);
                                 Console.WriteLine($"== {mp.To} received {control.Data.Count} from {mp.From} ==");
-                                Console.WriteLine($"== Progress: {receivedMessagePairs.Count}/{messagePairs.Count}");
+                                Console.WriteLine($"== Progress: {nReceivedMessagePairs}/{messagePairs.Count}");
                             }
                             else
                             {