aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-10-12 19:35:40 +0100
committerJustin Clark-Casey (justincc)2011-10-12 19:35:40 +0100
commitc5826d589ab2f33a71105bc2d3015ffbb7dd2973 (patch)
tree1b4c50e7f68cff2424d89cf4f2f5b968a0618c64
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC_OLD-c5826d589ab2f33a71105bc2d3015ffbb7dd2973.zip
opensim-SC_OLD-c5826d589ab2f33a71105bc2d3015ffbb7dd2973.tar.gz
opensim-SC_OLD-c5826d589ab2f33a71105bc2d3015ffbb7dd2973.tar.bz2
opensim-SC_OLD-c5826d589ab2f33a71105bc2d3015ffbb7dd2973.tar.xz
minor: insert some commented out log lines which are a blunt but useful instrument to see packet expiry and received acks
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs2
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs5
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/UnackedPacketCollection.cs8
3 files changed, 12 insertions, 3 deletions
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
3625 /// </summary> 3625 /// </summary>
3626 private void ResendPrimUpdates(List<EntityUpdate> updates, OutgoingPacket oPacket) 3626 private void ResendPrimUpdates(List<EntityUpdate> updates, OutgoingPacket oPacket)
3627 { 3627 {
3628 // m_log.WarnFormat("[CLIENT] resending prim update {0}",updates[0].UpdateTime); 3628 // m_log.WarnFormat("[CLIENT] resending prim updates {0}, packet sequence number {1}", updates[0].UpdateTime, oPacket.SequenceNumber);
3629 3629
3630 // Remove the update packet from the list of packets waiting for acknowledgement 3630 // Remove the update packet from the list of packets waiting for acknowledgement
3631 // because we are requeuing the list of updates. They will be resent in new packets 3631 // 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
592 592
593 RTO = rto; 593 RTO = rto;
594 594
595 //m_log.Debug("[LLUDPCLIENT]: Setting agent " + this.Agent.FullName + "'s RTO to " + RTO + "ms with an RTTVAR of " + 595 //if (RTO != rto)
596 // RTTVAR + " based on new RTT of " + r + "ms"); 596 // m_log.Debug("[LLUDPCLIENT]: Setting RTO to " + RTO + "ms from " + rto + "ms with an RTTVAR of " +
597 //RTTVAR + " based on new RTT of " + r + "ms");
597 } 598 }
598 599
599 /// <summary> 600 /// <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
164 } 164 }
165 } 165 }
166 166
167 //if (expiredPackets != null)
168 // m_log.DebugFormat("[UNACKED PACKET COLLECTION]: Found {0} expired packets on timeout of {1}", expiredPackets.Count, timeoutMS);
169
167 return expiredPackets; 170 return expiredPackets;
168 } 171 }
169 172
@@ -179,6 +182,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
179 PendingAck pendingAcknowledgement; 182 PendingAck pendingAcknowledgement;
180 while (m_pendingAcknowledgements.TryDequeue(out pendingAcknowledgement)) 183 while (m_pendingAcknowledgements.TryDequeue(out pendingAcknowledgement))
181 { 184 {
185 //m_log.DebugFormat("[UNACKED PACKET COLLECTION]: Processing ack {0}", pendingAcknowledgement.SequenceNumber);
182 OutgoingPacket ackedPacket; 186 OutgoingPacket ackedPacket;
183 if (m_packets.TryGetValue(pendingAcknowledgement.SequenceNumber, out ackedPacket)) 187 if (m_packets.TryGetValue(pendingAcknowledgement.SequenceNumber, out ackedPacket))
184 { 188 {
@@ -201,6 +205,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
201 ackedPacket.Client.UpdateRoundTrip(rtt); 205 ackedPacket.Client.UpdateRoundTrip(rtt);
202 } 206 }
203 } 207 }
208 else
209 {
210 //m_log.WarnFormat("[UNACKED PACKET COLLECTION]: Could not find packet with sequence number {0} to ack", pendingAcknowledgement.SequenceNumber);
211 }
204 } 212 }
205 } 213 }
206 214