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

* Fix bug in LLPacketHandler where the tickcount when a packet was approximately sent was not being stored in the ack record 

* This meant that acks were being sent out every 250ms when the ack timer fired, rather than when they had actually aged past m_ResendTimeout
0.6.0-stable
Justin Clarke Casey 2008-10-01 17:18:20 +00:00
parent d009927194
commit 95a3d6372d
2 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs
View File

@ -78,8 +78,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
public class LLPacketHandler : IPacketHandler public class LLPacketHandler : IPacketHandler
{ {
// private static readonly ILog m_log = //private static readonly ILog m_log =
// LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); // LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
// Packet queues // Packet queues
// //
@ -102,10 +102,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
// //
private class AckData private class AckData
{ {
public AckData(Packet packet, Object identifier) public AckData(Packet packet, Object identifier, int tickCount)
{ {
Packet = packet; Packet = packet;
Identifier = identifier; Identifier = identifier;
TickCount = tickCount;
} }
public Packet Packet; public Packet Packet;
@ -355,7 +356,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
{ {
// Resend the packet. Set the packet's tick count to // Resend the packet. Set the packet's tick count to
// now, and keep it marked as resent. // now, and keep it marked as resent.
// //m_log.DebugFormat(
// "[CLIENT]: Resending unacked packet number {0} after {1}ms",
// packet.Header.Sequence, now - data.TickCount);
packet.Header.Resent = true; packet.Header.Resent = true;
QueuePacket(packet, ThrottleOutPacketType.Resend, QueuePacket(packet, ThrottleOutPacketType.Resend,
data.Identifier); data.Identifier);
@ -372,8 +376,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP
if (!m_ReliableIsImportant || !packet.Header.Reliable) if (!m_ReliableIsImportant || !packet.Header.Reliable)
{ {
if (!m_ImportantPackets.Contains(packet.Type)) if (!m_ImportantPackets.Contains(packet.Type))
{
m_NeedAck.Remove(packet.Header.Sequence); m_NeedAck.Remove(packet.Header.Sequence);
//m_log.DebugFormat(
// "[CLIENT]: Discarding ack requirement for packet number {0}",
// packet.Header.Sequence);
}
TriggerOnPacketDrop(packet, data.Identifier); TriggerOnPacketDrop(packet, data.Identifier);
continue; continue;
@ -611,6 +621,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
lock (m_NeedAck) lock (m_NeedAck)
{ {
//m_log.DebugFormat("[CLIENT]: Received ack for packet sequence number {0}", id);
if (!m_NeedAck.TryGetValue(id, out data)) if (!m_NeedAck.TryGetValue(id, out data))
return; return;
@ -691,7 +703,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
{ {
} }
m_NeedAck.Add(key, new AckData(packet, null)); m_NeedAck.Add(key, new AckData(packet, null, System.Environment.TickCount));
} }
m_Sequence = info.sequence; m_Sequence = info.sequence;
@ -741,8 +753,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
{ {
Packet packet = item.Packet; Packet packet = item.Packet;
// Keep track of when this packet was sent out
item.TickCount = System.Environment.TickCount;
// Assign sequence number here to prevent out of order packets // Assign sequence number here to prevent out of order packets
if (packet.Header.Sequence == 0) if (packet.Header.Sequence == 0)
@ -755,8 +765,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
if (packet.Header.Reliable) if (packet.Header.Reliable)
{ {
m_UnackedBytes += packet.ToBytes().Length; m_UnackedBytes += packet.ToBytes().Length;
// Keep track of when this packet was sent out
m_NeedAck[packet.Header.Sequence] = new AckData(packet, m_NeedAck[packet.Header.Sequence] = new AckData(packet,
item.Identifier); item.Identifier, System.Environment.TickCount);
} }
} }
} }

2
OpenSim/Region/ClientStack/LindenUDP/LLPacketServer.cs
View File

@ -137,7 +137,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
} }
/// <summary> /// <summary>
/// /// Send a packet to the given circuit
/// </summary> /// </summary>
/// <param name="buffer"></param> /// <param name="buffer"></param>
/// <param name="size"></param> /// <param name="size"></param>