diff options
Diffstat (limited to 'OpenSim/Region/ClientStack')
-rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLUDPClient.cs | 16 | ||||
-rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs | 5 |
2 files changed, 14 insertions, 7 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUDPClient.cs b/OpenSim/Region/ClientStack/LindenUDP/LLUDPClient.cs index f1fdbc5..d6159cd 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLUDPClient.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLUDPClient.cs | |||
@@ -122,6 +122,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
122 | public int PacketsReceived; | 122 | public int PacketsReceived; |
123 | /// <summary>Number of packets sent to this client</summary> | 123 | /// <summary>Number of packets sent to this client</summary> |
124 | public int PacketsSent; | 124 | public int PacketsSent; |
125 | /// <summary>Number of packets resent to this client</summary> | ||
126 | public int PacketsResent; | ||
125 | /// <summary>Total byte count of unacked packets sent to this client</summary> | 127 | /// <summary>Total byte count of unacked packets sent to this client</summary> |
126 | public int UnackedBytes; | 128 | public int UnackedBytes; |
127 | 129 | ||
@@ -257,9 +259,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
257 | public string GetStats() | 259 | public string GetStats() |
258 | { | 260 | { |
259 | return string.Format( | 261 | return string.Format( |
260 | "{0,7} {1,7} {2,9} {3,8} {4,7} {5,7} {6,7} {7,7} {8,9} {9,7} {10,7}", | 262 | "{0,7} {1,7} {2,7} {3,9} {4,7} {5,7} {6,7} {7,7} {8,7} {9,8} {10,7} {11,7}", |
263 | PacketsReceived, | ||
261 | PacketsSent, | 264 | PacketsSent, |
262 | PacketsReceived, | 265 | PacketsResent, |
263 | UnackedBytes, | 266 | UnackedBytes, |
264 | m_packetOutboxes[(int)ThrottleOutPacketType.Resend].Count, | 267 | m_packetOutboxes[(int)ThrottleOutPacketType.Resend].Count, |
265 | m_packetOutboxes[(int)ThrottleOutPacketType.Land].Count, | 268 | m_packetOutboxes[(int)ThrottleOutPacketType.Land].Count, |
@@ -449,13 +452,16 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
449 | /// an outgoing packet from each, obeying the throttling bucket limits | 452 | /// an outgoing packet from each, obeying the throttling bucket limits |
450 | /// </summary> | 453 | /// </summary> |
451 | /// | 454 | /// |
455 | /// <remarks> | ||
452 | /// Packet queues are inspected in ascending numerical order starting from 0. Therefore, queues with a lower | 456 | /// Packet queues are inspected in ascending numerical order starting from 0. Therefore, queues with a lower |
453 | /// ThrottleOutPacketType number will see their packet get sent first (e.g. if both Land and Wind queues have | 457 | /// ThrottleOutPacketType number will see their packet get sent first (e.g. if both Land and Wind queues have |
454 | /// packets, then the packet at the front of the Land queue will be sent before the packet at the front of the | 458 | /// packets, then the packet at the front of the Land queue will be sent before the packet at the front of the |
455 | /// wind queue). | 459 | /// wind queue). |
456 | /// | 460 | /// |
457 | /// <remarks>This function is only called from a synchronous loop in the | 461 | /// This function is only called from a synchronous loop in the |
458 | /// UDPServer so we don't need to bother making this thread safe</remarks> | 462 | /// UDPServer so we don't need to bother making this thread safe |
463 | /// </remarks> | ||
464 | /// | ||
459 | /// <returns>True if any packets were sent, otherwise false</returns> | 465 | /// <returns>True if any packets were sent, otherwise false</returns> |
460 | public bool DequeueOutgoing() | 466 | public bool DequeueOutgoing() |
461 | { | 467 | { |
@@ -486,7 +492,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
486 | m_udpServer.SendPacketFinal(nextPacket); | 492 | m_udpServer.SendPacketFinal(nextPacket); |
487 | m_nextPackets[i] = null; | 493 | m_nextPackets[i] = null; |
488 | packetSent = true; | 494 | packetSent = true; |
489 | this.PacketsSent++; | ||
490 | } | 495 | } |
491 | } | 496 | } |
492 | else | 497 | else |
@@ -503,7 +508,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
503 | // Send the packet | 508 | // Send the packet |
504 | m_udpServer.SendPacketFinal(packet); | 509 | m_udpServer.SendPacketFinal(packet); |
505 | packetSent = true; | 510 | packetSent = true; |
506 | this.PacketsSent++; | ||
507 | } | 511 | } |
508 | else | 512 | else |
509 | { | 513 | { |
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs index 703176c..cfcc057 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs | |||
@@ -506,7 +506,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
506 | 506 | ||
507 | // Bump up the resend count on this packet | 507 | // Bump up the resend count on this packet |
508 | Interlocked.Increment(ref outgoingPacket.ResendCount); | 508 | Interlocked.Increment(ref outgoingPacket.ResendCount); |
509 | //Interlocked.Increment(ref Stats.ResentPackets); | ||
510 | 509 | ||
511 | // Requeue or resend the packet | 510 | // Requeue or resend the packet |
512 | if (!outgoingPacket.Client.EnqueueOutgoing(outgoingPacket, false)) | 511 | if (!outgoingPacket.Client.EnqueueOutgoing(outgoingPacket, false)) |
@@ -582,6 +581,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
582 | udpClient.NeedAcks.Add(outgoingPacket); | 581 | udpClient.NeedAcks.Add(outgoingPacket); |
583 | } | 582 | } |
584 | } | 583 | } |
584 | else | ||
585 | { | ||
586 | Interlocked.Increment(ref udpClient.PacketsResent); | ||
587 | } | ||
585 | 588 | ||
586 | #endregion Sequence Number Assignment | 589 | #endregion Sequence Number Assignment |
587 | 590 | ||