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

streamlining m_NeedAck logic

0.6.6-post-fixes
Dr Scofield 2009-06-25 08:00:43 +00:00
parent 9f83f124c7
commit 1b06da0c54
1 changed files with 29 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -276,46 +276,44 @@ namespace OpenSim.Region.ClientStack.LindenUDP
lock (m_NeedAck) lock (m_NeedAck)
{ {
if (m_DropSafeTimeout > now || if (m_DropSafeTimeout > now ||
intervalMs > 500) // We were frozen! intervalMs > 500) // We were frozen!
{ {
foreach (LLQueItem data in new List<LLQueItem> foreach (LLQueItem data in m_NeedAck.Values)
(m_NeedAck.Values))
{ {
if (m_DropSafeTimeout > now) if (m_DropSafeTimeout > now)
{ {
m_NeedAck[data.Packet.Header.Sequence]. m_NeedAck[data.Packet.Header.Sequence].TickCount = now;
TickCount = now;
} }
else else
{ {
m_NeedAck[data.Packet.Header.Sequence]. m_NeedAck[data.Packet.Header.Sequence].TickCount += intervalMs;
TickCount += intervalMs;
} }
} }
} }
}
m_LastResend = now;
// Unless we have received at least one ack, don't bother resending m_LastResend = now;
// anything. There may not be a client there, don't clog up the
// pipes. // Unless we have received at least one ack, don't bother resending
// // anything. There may not be a client there, don't clog up the
lock (m_NeedAck) // pipes.
{
// Nothing to do // Nothing to do
// //
if (m_NeedAck.Count == 0) if (m_NeedAck.Count == 0)
return; return;
int resent = 0; int resent = 0;
long dueDate = now - m_ResendTimeout;
foreach (LLQueItem data in new List<LLQueItem>(m_NeedAck.Values)) List<LLQueItem> dropped = new List<LLQueItem>();
foreach (LLQueItem data in m_NeedAck.Values)
{ {
Packet packet = data.Packet; Packet packet = data.Packet;
// Packets this old get resent // Packets this old get resent
// //
if ((now - data.TickCount) > m_ResendTimeout && data.Sequence != 0 && !m_PacketQueue.Contains(data.Sequence)) if (data.TickCount < dueDate && data.Sequence != 0 && !m_PacketQueue.Contains(data.Sequence))
{ {
if (resent < 20) // Was 20 (= Max 117kbit/sec resends) if (resent < 20) // Was 20 (= Max 117kbit/sec resends)
{ {
@ -325,31 +323,31 @@ namespace OpenSim.Region.ClientStack.LindenUDP
// that it should reset its sequence to that packet number. // that it should reset its sequence to that packet number.
packet.Header.Resent = true; packet.Header.Resent = true;
if ((m_NeedAck[packet.Header.Sequence].Resends >= if ((m_NeedAck[packet.Header.Sequence].Resends >= m_MaxReliableResends) &&
m_MaxReliableResends) && (!m_ReliableIsImportant)) (!m_ReliableIsImportant))
{ {
m_NeedAck.Remove(packet.Header.Sequence); dropped.Add(data);
TriggerOnPacketDrop(packet, data.Identifier);
m_PacketQueue.Cancel(packet.Header.Sequence);
PacketPool.Instance.ReturnPacket(packet);
continue; continue;
} }
m_NeedAck[packet.Header.Sequence].TickCount = m_NeedAck[packet.Header.Sequence].TickCount = Environment.TickCount;
Environment.TickCount; QueuePacket(packet, ThrottleOutPacketType.Resend, data.Identifier);
QueuePacket(packet, ThrottleOutPacketType.Resend,
data.Identifier);
resent++; resent++;
} }
else else
{ {
m_NeedAck[packet.Header.Sequence].TickCount += m_NeedAck[packet.Header.Sequence].TickCount += intervalMs;
intervalMs;
} }
} }
} }
foreach(LLQueItem data in dropped)
{
m_NeedAck.Remove(data.Packet.Header.Sequence);
TriggerOnPacketDrop(data.Packet, data.Identifier);
m_PacketQueue.Cancel(data.Packet.Header.Sequence);
PacketPool.Instance.ReturnPacket(data.Packet);
}
} }
} }