diff options
Diffstat (limited to 'OpenSim/Region/ClientStack/LindenUDP/LLUDPClient.cs')
-rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLUDPClient.cs | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUDPClient.cs b/OpenSim/Region/ClientStack/LindenUDP/LLUDPClient.cs index d4c3307..65a8fe3 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 | ||
@@ -256,9 +258,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
256 | public string GetStats() | 258 | public string GetStats() |
257 | { | 259 | { |
258 | return string.Format( | 260 | return string.Format( |
259 | "{0,7} {1,7} {2,9} {3,8} {4,7} {5,7} {6,7} {7,7} {8,9} {9,7} {10,7}", | 261 | "{0,7} {1,7} {2,7} {3,9} {4,7} {5,7} {6,7} {7,7} {8,7} {9,8} {10,7} {11,7}", |
262 | PacketsReceived, | ||
260 | PacketsSent, | 263 | PacketsSent, |
261 | PacketsReceived, | 264 | PacketsResent, |
262 | UnackedBytes, | 265 | UnackedBytes, |
263 | m_packetOutboxes[(int)ThrottleOutPacketType.Resend].Count, | 266 | m_packetOutboxes[(int)ThrottleOutPacketType.Resend].Count, |
264 | m_packetOutboxes[(int)ThrottleOutPacketType.Land].Count, | 267 | m_packetOutboxes[(int)ThrottleOutPacketType.Land].Count, |
@@ -441,13 +444,16 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
441 | /// an outgoing packet from each, obeying the throttling bucket limits | 444 | /// an outgoing packet from each, obeying the throttling bucket limits |
442 | /// </summary> | 445 | /// </summary> |
443 | /// | 446 | /// |
447 | /// <remarks> | ||
444 | /// Packet queues are inspected in ascending numerical order starting from 0. Therefore, queues with a lower | 448 | /// Packet queues are inspected in ascending numerical order starting from 0. Therefore, queues with a lower |
445 | /// ThrottleOutPacketType number will see their packet get sent first (e.g. if both Land and Wind queues have | 449 | /// ThrottleOutPacketType number will see their packet get sent first (e.g. if both Land and Wind queues have |
446 | /// packets, then the packet at the front of the Land queue will be sent before the packet at the front of the | 450 | /// packets, then the packet at the front of the Land queue will be sent before the packet at the front of the |
447 | /// wind queue). | 451 | /// wind queue). |
448 | /// | 452 | /// |
449 | /// <remarks>This function is only called from a synchronous loop in the | 453 | /// This function is only called from a synchronous loop in the |
450 | /// UDPServer so we don't need to bother making this thread safe</remarks> | 454 | /// UDPServer so we don't need to bother making this thread safe |
455 | /// </remarks> | ||
456 | /// | ||
451 | /// <returns>True if any packets were sent, otherwise false</returns> | 457 | /// <returns>True if any packets were sent, otherwise false</returns> |
452 | public bool DequeueOutgoing() | 458 | public bool DequeueOutgoing() |
453 | { | 459 | { |
@@ -476,7 +482,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
476 | m_udpServer.SendPacketFinal(nextPacket); | 482 | m_udpServer.SendPacketFinal(nextPacket); |
477 | m_nextPackets[i] = null; | 483 | m_nextPackets[i] = null; |
478 | packetSent = true; | 484 | packetSent = true; |
479 | this.PacketsSent++; | ||
480 | } | 485 | } |
481 | } | 486 | } |
482 | else | 487 | else |
@@ -493,7 +498,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
493 | // Send the packet | 498 | // Send the packet |
494 | m_udpServer.SendPacketFinal(packet); | 499 | m_udpServer.SendPacketFinal(packet); |
495 | packetSent = true; | 500 | packetSent = true; |
496 | this.PacketsSent++; | ||
497 | } | 501 | } |
498 | else | 502 | else |
499 | { | 503 | { |