OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

minor: insert some commented out log lines which are a blunt but useful instrument to see packet expiry and received acks

remove-scene-viewer
Justin Clark-Casey (justincc) 2011-10-12 19:35:40 +01:00
parent 36e73dbc9b
commit c5826d589a
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
View File

@ -3625,7 +3625,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
/// </summary> /// </summary>
private void ResendPrimUpdates(List<EntityUpdate> updates, OutgoingPacket oPacket) 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 // 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 // because we are requeuing the list of updates. They will be resent in new packets

5
OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs
View File

@ -592,8 +592,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
RTO = rto; RTO = rto;
//m_log.Debug("[LLUDPCLIENT]: Setting agent " + this.Agent.FullName + "'s RTO to " + RTO + "ms with an RTTVAR of " + //if (RTO != rto)
// RTTVAR + " based on new RTT of " + r + "ms"); // 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> /// <summary>

8
OpenSim/Region/ClientStack/Linden/UDP/UnackedPacketCollection.cs
View File

@ -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; return expiredPackets;
} }
@ -179,6 +182,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
PendingAck pendingAcknowledgement; PendingAck pendingAcknowledgement;
while (m_pendingAcknowledgements.TryDequeue(out pendingAcknowledgement)) while (m_pendingAcknowledgements.TryDequeue(out pendingAcknowledgement))
{ {
//m_log.DebugFormat("[UNACKED PACKET COLLECTION]: Processing ack {0}", pendingAcknowledgement.SequenceNumber);
OutgoingPacket ackedPacket; OutgoingPacket ackedPacket;
if (m_packets.TryGetValue(pendingAcknowledgement.SequenceNumber, out ackedPacket)) if (m_packets.TryGetValue(pendingAcknowledgement.SequenceNumber, out ackedPacket))
{ {
@ -201,6 +205,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
ackedPacket.Client.UpdateRoundTrip(rtt); ackedPacket.Client.UpdateRoundTrip(rtt);
} }
} }
else
{
//m_log.WarnFormat("[UNACKED PACKET COLLECTION]: Could not find packet with sequence number {0} to ack", pendingAcknowledgement.SequenceNumber);
}
} }
} }