diff options
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden/UDP/Tests/ThrottleTests.cs')
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/Tests/ThrottleTests.cs | 8 |
1 files changed, 4 insertions, 4 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, |