From c5826d589ab2f33a71105bc2d3015ffbb7dd2973 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 12 Oct 2011 19:35:40 +0100
Subject: minor: insert some commented out log lines which are a blunt but
 useful instrument to see packet expiry and received acks

---
 OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs            | 2 +-
 OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs             | 5 +++--
 OpenSim/Region/ClientStack/Linden/UDP/UnackedPacketCollection.cs | 8 ++++++++
 3 files changed, 12 insertions(+), 3 deletions(-)

(limited to 'OpenSim/Region')

diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index 29dce17..a4887ad 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -3625,7 +3625,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         /// </summary>
         private void ResendPrimUpdates(List<EntityUpdate> updates, OutgoingPacket oPacket)
         {
-            // m_log.WarnFormat("[CLIENT] resending prim update {0}",updates[0].UpdateTime);
+            // m_log.WarnFormat("[CLIENT] resending prim updates {0}, packet sequence number {1}", updates[0].UpdateTime, oPacket.SequenceNumber);
 
             // Remove the update packet from the list of packets waiting for acknowledgement
             // because we are requeuing the list of updates. They will be resent in new packets
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs
index 31cc515..ffa3be4 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs
@@ -592,8 +592,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
             RTO = rto;
 
-            //m_log.Debug("[LLUDPCLIENT]: Setting agent " + this.Agent.FullName + "'s RTO to " + RTO + "ms with an RTTVAR of " +
-            //    RTTVAR + " based on new RTT of " + r + "ms");
+            //if (RTO != rto)
+       //          m_log.Debug("[LLUDPCLIENT]: Setting RTO to " + RTO + "ms from " + rto + "ms with an RTTVAR of " +
+                       //RTTVAR + " based on new RTT of " + r + "ms");
         }
 
         /// <summary>
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/UnackedPacketCollection.cs b/OpenSim/Region/ClientStack/Linden/UDP/UnackedPacketCollection.cs
index 6b1d7d2..9d6c09e 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/UnackedPacketCollection.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/UnackedPacketCollection.cs
@@ -164,6 +164,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 }
             }
 
+                //if (expiredPackets != null)
+                //   m_log.DebugFormat("[UNACKED PACKET COLLECTION]: Found {0} expired packets on timeout of {1}", expiredPackets.Count, timeoutMS);
+
             return expiredPackets;
         }
 
@@ -179,6 +182,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             PendingAck pendingAcknowledgement;
             while (m_pendingAcknowledgements.TryDequeue(out pendingAcknowledgement))
             {
+                //m_log.DebugFormat("[UNACKED PACKET COLLECTION]: Processing ack {0}", pendingAcknowledgement.SequenceNumber);
                 OutgoingPacket ackedPacket;
                 if (m_packets.TryGetValue(pendingAcknowledgement.SequenceNumber, out ackedPacket))
                 {
@@ -201,6 +205,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                                 ackedPacket.Client.UpdateRoundTrip(rtt);
                         }
                     }
+                    else
+                    {
+                         //m_log.WarnFormat("[UNACKED PACKET COLLECTION]: Could not find packet with sequence number {0} to ack", pendingAcknowledgement.SequenceNumber);
+                    }
                 }
             }
 
-- 
cgit v1.1