diff options
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden/UDP/UnackedPacketCollection.cs')
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/UnackedPacketCollection.cs | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/UnackedPacketCollection.cs b/OpenSim/Region/ClientStack/Linden/UDP/UnackedPacketCollection.cs index c9d5697..76f4c6f 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/UnackedPacketCollection.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/UnackedPacketCollection.cs | |||
@@ -80,7 +80,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
80 | m_packets.Clear(); | 80 | m_packets.Clear(); |
81 | m_pendingAdds = null; | 81 | m_pendingAdds = null; |
82 | m_pendingAcknowledgements = null; | 82 | m_pendingAcknowledgements = null; |
83 | m_pendingRemoves = null; | 83 | m_pendingRemoves = null; |
84 | } | 84 | } |
85 | 85 | ||
86 | /// <summary> | 86 | /// <summary> |
@@ -94,7 +94,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
94 | public void Add(OutgoingPacket packet) | 94 | public void Add(OutgoingPacket packet) |
95 | { | 95 | { |
96 | m_pendingAdds.Enqueue(packet); | 96 | m_pendingAdds.Enqueue(packet); |
97 | Interlocked.Add(ref packet.Client.UnackedBytes, packet.Buffer.DataLength); | 97 | Interlocked.Add(ref packet.Client.UnackedBytes, packet.Buffer.DataLength); |
98 | } | 98 | } |
99 | 99 | ||
100 | /// <summary> | 100 | /// <summary> |
@@ -116,7 +116,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
116 | /// <summary> | 116 | /// <summary> |
117 | /// Marks a packet as no longer needing acknowledgement without a received acknowledgement. | 117 | /// Marks a packet as no longer needing acknowledgement without a received acknowledgement. |
118 | /// This method is called when a packet expires and we no longer need an acknowledgement. | 118 | /// This method is called when a packet expires and we no longer need an acknowledgement. |
119 | /// When some reliable packet types expire, they are handled in a way other than simply | 119 | /// When some reliable packet types expire, they are handled in a way other than simply |
120 | /// resending them. The only effect of removal this way is to update unacked byte count. | 120 | /// resending them. The only effect of removal this way is to update unacked byte count. |
121 | /// </summary> | 121 | /// </summary> |
122 | /// <param name="sequenceNumber">Sequence number of the packet to | 122 | /// <param name="sequenceNumber">Sequence number of the packet to |
@@ -155,7 +155,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
155 | 155 | ||
156 | foreach (OutgoingPacket packet in m_packets.Values) | 156 | foreach (OutgoingPacket packet in m_packets.Values) |
157 | { | 157 | { |
158 | // TickCount of zero means a packet is in the resend queue | 158 | // TickCount of zero means a packet is in the resend queue |
159 | // but hasn't actually been sent over the wire yet | 159 | // but hasn't actually been sent over the wire yet |
160 | if (packet.TickCount == 0) | 160 | if (packet.TickCount == 0) |
161 | continue; | 161 | continue; |
@@ -172,7 +172,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
172 | // As with other network applications, assume that an expired packet is | 172 | // As with other network applications, assume that an expired packet is |
173 | // an indication of some network problem, slow transmission | 173 | // an indication of some network problem, slow transmission |
174 | packet.Client.FlowThrottle.ExpirePackets(1); | 174 | packet.Client.FlowThrottle.ExpirePackets(1); |
175 | 175 | ||
176 | expiredPackets.Add(packet); | 176 | expiredPackets.Add(packet); |
177 | } | 177 | } |
178 | } | 178 | } |
@@ -191,7 +191,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
191 | while (m_pendingAdds.TryDequeue(out pendingAdd)) | 191 | while (m_pendingAdds.TryDequeue(out pendingAdd)) |
192 | if (pendingAdd != null) | 192 | if (pendingAdd != null) |
193 | m_packets[pendingAdd.SequenceNumber] = pendingAdd; | 193 | m_packets[pendingAdd.SequenceNumber] = pendingAdd; |
194 | 194 | ||
195 | // Process all the pending removes, including updating statistics and round-trip times | 195 | // Process all the pending removes, including updating statistics and round-trip times |
196 | PendingAck pendingAcknowledgement; | 196 | PendingAck pendingAcknowledgement; |
197 | while (m_pendingAcknowledgements.TryDequeue(out pendingAcknowledgement)) | 197 | while (m_pendingAcknowledgements.TryDequeue(out pendingAcknowledgement)) |
@@ -228,7 +228,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
228 | else | 228 | else |
229 | { | 229 | { |
230 | // m_log.WarnFormat("[UNACKED PACKET COLLECTION]: Could not find packet with sequence number {0} to ack", | 230 | // m_log.WarnFormat("[UNACKED PACKET COLLECTION]: Could not find packet with sequence number {0} to ack", |
231 | // pendingAcknowledgement.SequenceNumber); | 231 | // pendingAcknowledgement.SequenceNumber); |
232 | } | 232 | } |
233 | } | 233 | } |
234 | 234 | ||