diff options
Diffstat (limited to 'OpenSim/Region/ClientStack')
-rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLUDPClient.cs | 7 | ||||
-rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs | 5 |
2 files changed, 9 insertions, 3 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUDPClient.cs b/OpenSim/Region/ClientStack/LindenUDP/LLUDPClient.cs index 21bd99e..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, |
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs index df8ddbb..5ff9aee 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 | ||