diff options
author | Mic Bowman | 2014-12-30 14:43:42 -0800 |
---|---|---|
committer | Mic Bowman | 2014-12-30 14:43:42 -0800 |
commit | 5bb73793c73bfb40d90c99c0fd1f2f21425a2c0f (patch) | |
tree | 9ed7e54d0398f7a508fc37caa57685e0d9ac3226 /OpenSim/Region/ClientStack/Linden | |
parent | Turn on logging of old acks, this is for debugging only, stats version coming... (diff) | |
download | opensim-SC_OLD-5bb73793c73bfb40d90c99c0fd1f2f21425a2c0f.zip opensim-SC_OLD-5bb73793c73bfb40d90c99c0fd1f2f21425a2c0f.tar.gz opensim-SC_OLD-5bb73793c73bfb40d90c99c0fd1f2f21425a2c0f.tar.bz2 opensim-SC_OLD-5bb73793c73bfb40d90c99c0fd1f2f21425a2c0f.tar.xz |
Comment out the debugging statements added in the last commit. Keeping
them in the code for later use rather than just reverting them.
Fixed the throttle tests for the new algorithm used when packets
are marked as expired.
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden')
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/Tests/ThrottleTests.cs | 8 | ||||
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/UnackedPacketCollection.cs | 18 |
2 files changed, 13 insertions, 13 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/Tests/ThrottleTests.cs b/OpenSim/Region/ClientStack/Linden/UDP/Tests/ThrottleTests.cs index 9241e37..3c82a78 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/Tests/ThrottleTests.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/Tests/ThrottleTests.cs | |||
@@ -186,8 +186,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests | |||
186 | udpServer.Throttle.DebugLevel = 1; | 186 | udpServer.Throttle.DebugLevel = 1; |
187 | udpClient.ThrottleDebugLevel = 1; | 187 | udpClient.ThrottleDebugLevel = 1; |
188 | 188 | ||
189 | // Total is 280000 | 189 | // Total is 275000 |
190 | int resendBytes = 10000; | 190 | int resendBytes = 5000; // this is set low to test the minimum throttle override |
191 | int landBytes = 20000; | 191 | int landBytes = 20000; |
192 | int windBytes = 30000; | 192 | int windBytes = 30000; |
193 | int cloudBytes = 40000; | 193 | int cloudBytes = 40000; |
@@ -214,13 +214,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests | |||
214 | 214 | ||
215 | AssertThrottles( | 215 | AssertThrottles( |
216 | udpClient, | 216 | udpClient, |
217 | resendBytes * commitRatio, landBytes * commitRatio, windBytes * commitRatio, cloudBytes * commitRatio, taskBytes * commitRatio, | 217 | LLUDPServer.MTU, landBytes * commitRatio, windBytes * commitRatio, cloudBytes * commitRatio, taskBytes * commitRatio, |
218 | textureBytes * commitRatio, assetBytes * commitRatio, udpClient.FlowThrottle.AdjustedDripRate, totalBytes, 0); | 218 | textureBytes * commitRatio, assetBytes * commitRatio, udpClient.FlowThrottle.AdjustedDripRate, totalBytes, 0); |
219 | 219 | ||
220 | // Test a decrease in target throttle, adaptive throttle should cut the rate by 50% with a floor | 220 | // Test a decrease in target throttle, adaptive throttle should cut the rate by 50% with a floor |
221 | // set by the minimum adaptive rate | 221 | // set by the minimum adaptive rate |
222 | udpClient.FlowThrottle.ExpirePackets(1); | 222 | udpClient.FlowThrottle.ExpirePackets(1); |
223 | commitRatio = Math.Max((32000.0 + 20.0 * LLUDPServer.MTU)/Math.Pow(2,1), 32000.0) / totalBytes; | 223 | commitRatio = (32000.0 + (20.0 * LLUDPServer.MTU)/Math.Pow(2,1)) / totalBytes; |
224 | 224 | ||
225 | AssertThrottles( | 225 | AssertThrottles( |
226 | udpClient, | 226 | udpClient, |
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/UnackedPacketCollection.cs b/OpenSim/Region/ClientStack/Linden/UDP/UnackedPacketCollection.cs index 3599a16..b546a99 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/UnackedPacketCollection.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/UnackedPacketCollection.cs | |||
@@ -31,8 +31,8 @@ using System.Net; | |||
31 | using System.Threading; | 31 | using System.Threading; |
32 | using OpenMetaverse; | 32 | using OpenMetaverse; |
33 | 33 | ||
34 | using System.Reflection; | 34 | //using System.Reflection; |
35 | using log4net; | 35 | //using log4net; |
36 | 36 | ||
37 | namespace OpenSim.Region.ClientStack.LindenUDP | 37 | namespace OpenSim.Region.ClientStack.LindenUDP |
38 | { | 38 | { |
@@ -63,7 +63,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
63 | } | 63 | } |
64 | } | 64 | } |
65 | 65 | ||
66 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 66 | //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
67 | 67 | ||
68 | /// <summary>Holds the actual unacked packet data, sorted by sequence number</summary> | 68 | /// <summary>Holds the actual unacked packet data, sorted by sequence number</summary> |
69 | private Dictionary<uint, OutgoingPacket> m_packets = new Dictionary<uint, OutgoingPacket>(); | 69 | private Dictionary<uint, OutgoingPacket> m_packets = new Dictionary<uint, OutgoingPacket>(); |
@@ -169,8 +169,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
169 | } | 169 | } |
170 | } | 170 | } |
171 | 171 | ||
172 | //if (expiredPackets != null) | 172 | // if (expiredPackets != null) |
173 | // m_log.DebugFormat("[UNACKED PACKET COLLECTION]: Found {0} expired packets on timeout of {1}", expiredPackets.Count, timeoutMS); | 173 | // m_log.DebugFormat("[UNACKED PACKET COLLECTION]: Found {0} expired packets on timeout of {1}", expiredPackets.Count, timeoutMS); |
174 | 174 | ||
175 | return expiredPackets; | 175 | return expiredPackets; |
176 | } | 176 | } |
@@ -212,14 +212,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
212 | } | 212 | } |
213 | else | 213 | else |
214 | { | 214 | { |
215 | m_log.WarnFormat("[UNACKED PACKET COLLECTION]: found null packet for sequence number {0} to ack", | 215 | // m_log.WarnFormat("[UNACKED PACKET COLLECTION]: found null packet for sequence number {0} to ack", |
216 | pendingAcknowledgement.SequenceNumber); | 216 | // pendingAcknowledgement.SequenceNumber); |
217 | } | 217 | } |
218 | } | 218 | } |
219 | else | 219 | else |
220 | { | 220 | { |
221 | m_log.WarnFormat("[UNACKED PACKET COLLECTION]: Could not find packet with sequence number {0} to ack", | 221 | // m_log.WarnFormat("[UNACKED PACKET COLLECTION]: Could not find packet with sequence number {0} to ack", |
222 | pendingAcknowledgement.SequenceNumber); | 222 | // pendingAcknowledgement.SequenceNumber); |
223 | } | 223 | } |
224 | } | 224 | } |
225 | 225 | ||