diff options
author | Melanie | 2011-10-25 01:35:51 +0100 |
---|---|---|
committer | Melanie | 2011-10-25 01:35:51 +0100 |
commit | 0b833c458a0c27c349b54bcb7caef62e4f375921 (patch) | |
tree | 439386646c09a188f3a0a767ceb64afa7795113d /OpenSim | |
parent | Merge commit '36e73dbc9b7fb46885865f5537c43a29239fd559' into bigmerge (diff) | |
parent | minor: insert some commented out log lines which are a blunt but useful instr... (diff) | |
download | opensim-SC-0b833c458a0c27c349b54bcb7caef62e4f375921.zip opensim-SC-0b833c458a0c27c349b54bcb7caef62e4f375921.tar.gz opensim-SC-0b833c458a0c27c349b54bcb7caef62e4f375921.tar.bz2 opensim-SC-0b833c458a0c27c349b54bcb7caef62e4f375921.tar.xz |
Merge commit 'c5826d589ab2f33a71105bc2d3015ffbb7dd2973' into bigmerge
Diffstat (limited to '')
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 0c92308..14666d6 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | |||
@@ -3660,7 +3660,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
3660 | /// </summary> | 3660 | /// </summary> |
3661 | private void ResendPrimUpdates(List<EntityUpdate> updates, OutgoingPacket oPacket) | 3661 | private void ResendPrimUpdates(List<EntityUpdate> updates, OutgoingPacket oPacket) |
3662 | { | 3662 | { |
3663 | // m_log.WarnFormat("[CLIENT] resending prim update {0}",updates[0].UpdateTime); | 3663 | // m_log.WarnFormat("[CLIENT] resending prim updates {0}, packet sequence number {1}", updates[0].UpdateTime, oPacket.SequenceNumber); |
3664 | 3664 | ||
3665 | // Remove the update packet from the list of packets waiting for acknowledgement | 3665 | // Remove the update packet from the list of packets waiting for acknowledgement |
3666 | // because we are requeuing the list of updates. They will be resent in new packets | 3666 | // 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 3802482..c951071 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs | |||
@@ -602,8 +602,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
602 | 602 | ||
603 | RTO = rto; | 603 | RTO = rto; |
604 | 604 | ||
605 | //m_log.Debug("[LLUDPCLIENT]: Setting agent " + this.Agent.FullName + "'s RTO to " + RTO + "ms with an RTTVAR of " + | 605 | //if (RTO != rto) |
606 | // RTTVAR + " based on new RTT of " + r + "ms"); | 606 | // m_log.Debug("[LLUDPCLIENT]: Setting RTO to " + RTO + "ms from " + rto + "ms with an RTTVAR of " + |
607 | //RTTVAR + " based on new RTT of " + r + "ms"); | ||
607 | } | 608 | } |
608 | 609 | ||
609 | /// <summary> | 610 | /// <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 | ||