diff options
author | Melanie Thielker | 2017-01-05 19:07:37 +0000 |
---|---|---|
committer | Melanie Thielker | 2017-01-05 19:07:37 +0000 |
commit | b16abc8166c29585cb76cc55c3bdd76e5833cb4f (patch) | |
tree | 6a34f465a74b7a3a6dc00a3d7aa8dcc25ac3e3a5 /OpenSim/Region/ClientStack/Linden/UDP/Tests/ThrottleTests.cs | |
parent | Make it possible to disable the bakes module in the way it is described in co... (diff) | |
download | opensim-SC_OLD-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.zip opensim-SC_OLD-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.gz opensim-SC_OLD-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.bz2 opensim-SC_OLD-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.xz |
Massive tab and trailing space cleanup
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden/UDP/Tests/ThrottleTests.cs')
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/Tests/ThrottleTests.cs | 58 |
1 files changed, 29 insertions, 29 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/Tests/ThrottleTests.cs b/OpenSim/Region/ClientStack/Linden/UDP/Tests/ThrottleTests.cs index 5e41dbd..873b1e5 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/Tests/ThrottleTests.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/Tests/ThrottleTests.cs | |||
@@ -137,7 +137,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests | |||
137 | Scene scene = new SceneHelpers().SetupScene(); | 137 | Scene scene = new SceneHelpers().SetupScene(); |
138 | TestLLUDPServer udpServer = ClientStackHelpers.AddUdpServer(scene); | 138 | TestLLUDPServer udpServer = ClientStackHelpers.AddUdpServer(scene); |
139 | 139 | ||
140 | ScenePresence sp | 140 | ScenePresence sp |
141 | = ClientStackHelpers.AddChildClient( | 141 | = ClientStackHelpers.AddChildClient( |
142 | scene, udpServer, TestHelpers.ParseTail(0x1), TestHelpers.ParseTail(0x2), 123456); | 142 | scene, udpServer, TestHelpers.ParseTail(0x1), TestHelpers.ParseTail(0x2), 123456); |
143 | 143 | ||
@@ -145,7 +145,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests | |||
145 | 145 | ||
146 | udpServer.Throttle.DebugLevel = 1; | 146 | udpServer.Throttle.DebugLevel = 1; |
147 | udpClient.ThrottleDebugLevel = 1; | 147 | udpClient.ThrottleDebugLevel = 1; |
148 | 148 | ||
149 | int resendBytes = 1000; | 149 | int resendBytes = 1000; |
150 | int landBytes = 2000; | 150 | int landBytes = 2000; |
151 | int windBytes = 3000; | 151 | int windBytes = 3000; |
@@ -161,8 +161,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests | |||
161 | int totalBytes = LLUDPServer.MTU + landBytes + windBytes + cloudBytes + taskBytes + textureBytes + assetBytes; | 161 | int totalBytes = LLUDPServer.MTU + landBytes + windBytes + cloudBytes + taskBytes + textureBytes + assetBytes; |
162 | 162 | ||
163 | AssertThrottles( | 163 | AssertThrottles( |
164 | udpClient, | 164 | udpClient, |
165 | LLUDPServer.MTU, landBytes, windBytes, cloudBytes, taskBytes, | 165 | LLUDPServer.MTU, landBytes, windBytes, cloudBytes, taskBytes, |
166 | textureBytes, assetBytes, totalBytes, 0, 0); | 166 | textureBytes, assetBytes, totalBytes, 0, 0); |
167 | } | 167 | } |
168 | 168 | ||
@@ -181,7 +181,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests | |||
181 | 181 | ||
182 | TestLLUDPServer udpServer = ClientStackHelpers.AddUdpServer(scene, ics); | 182 | TestLLUDPServer udpServer = ClientStackHelpers.AddUdpServer(scene, ics); |
183 | 183 | ||
184 | ScenePresence sp | 184 | ScenePresence sp |
185 | = ClientStackHelpers.AddChildClient( | 185 | = ClientStackHelpers.AddChildClient( |
186 | scene, udpServer, TestHelpers.ParseTail(0x1), TestHelpers.ParseTail(0x2), 123456); | 186 | scene, udpServer, TestHelpers.ParseTail(0x1), TestHelpers.ParseTail(0x2), 123456); |
187 | 187 | ||
@@ -207,7 +207,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests | |||
207 | double commitRatio = 32000.0 / totalBytes; | 207 | double commitRatio = 32000.0 / totalBytes; |
208 | 208 | ||
209 | AssertThrottles( | 209 | AssertThrottles( |
210 | udpClient, | 210 | udpClient, |
211 | LLUDPServer.MTU, landBytes * commitRatio, windBytes * commitRatio, cloudBytes * commitRatio, taskBytes * commitRatio, | 211 | LLUDPServer.MTU, landBytes * commitRatio, windBytes * commitRatio, cloudBytes * commitRatio, taskBytes * commitRatio, |
212 | textureBytes * commitRatio, assetBytes * commitRatio, udpClient.FlowThrottle.AdjustedDripRate, totalBytes, 0); | 212 | textureBytes * commitRatio, assetBytes * commitRatio, udpClient.FlowThrottle.AdjustedDripRate, totalBytes, 0); |
213 | 213 | ||
@@ -217,7 +217,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests | |||
217 | commitRatio = (32000.0 + 20.0 * LLUDPServer.MTU) / totalBytes; | 217 | commitRatio = (32000.0 + 20.0 * LLUDPServer.MTU) / totalBytes; |
218 | 218 | ||
219 | AssertThrottles( | 219 | AssertThrottles( |
220 | udpClient, | 220 | udpClient, |
221 | LLUDPServer.MTU, landBytes * commitRatio, windBytes * commitRatio, cloudBytes * commitRatio, taskBytes * commitRatio, | 221 | LLUDPServer.MTU, landBytes * commitRatio, windBytes * commitRatio, cloudBytes * commitRatio, taskBytes * commitRatio, |
222 | textureBytes * commitRatio, assetBytes * commitRatio, udpClient.FlowThrottle.AdjustedDripRate, totalBytes, 0); | 222 | textureBytes * commitRatio, assetBytes * commitRatio, udpClient.FlowThrottle.AdjustedDripRate, totalBytes, 0); |
223 | 223 | ||
@@ -227,7 +227,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests | |||
227 | commitRatio = (32000.0 + (20.0 * LLUDPServer.MTU)/Math.Pow(2,1)) / totalBytes; | 227 | commitRatio = (32000.0 + (20.0 * LLUDPServer.MTU)/Math.Pow(2,1)) / totalBytes; |
228 | 228 | ||
229 | AssertThrottles( | 229 | AssertThrottles( |
230 | udpClient, | 230 | udpClient, |
231 | LLUDPServer.MTU, landBytes * commitRatio, windBytes * commitRatio, cloudBytes * commitRatio, taskBytes * commitRatio, | 231 | LLUDPServer.MTU, landBytes * commitRatio, windBytes * commitRatio, cloudBytes * commitRatio, taskBytes * commitRatio, |
232 | textureBytes * commitRatio, assetBytes * commitRatio, udpClient.FlowThrottle.AdjustedDripRate, totalBytes, 0); | 232 | textureBytes * commitRatio, assetBytes * commitRatio, udpClient.FlowThrottle.AdjustedDripRate, totalBytes, 0); |
233 | } | 233 | } |
@@ -248,14 +248,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests | |||
248 | int taskBytes = 14000; | 248 | int taskBytes = 14000; |
249 | int textureBytes = 16000; | 249 | int textureBytes = 16000; |
250 | int assetBytes = 18000; | 250 | int assetBytes = 18000; |
251 | int totalBytes | 251 | int totalBytes |
252 | = (int)((resendBytes + landBytes + windBytes + cloudBytes + taskBytes + textureBytes + assetBytes) / 2); | 252 | = (int)((resendBytes + landBytes + windBytes + cloudBytes + taskBytes + textureBytes + assetBytes) / 2); |
253 | 253 | ||
254 | Scene scene = new SceneHelpers().SetupScene(); | 254 | Scene scene = new SceneHelpers().SetupScene(); |
255 | TestLLUDPServer udpServer = ClientStackHelpers.AddUdpServer(scene); | 255 | TestLLUDPServer udpServer = ClientStackHelpers.AddUdpServer(scene); |
256 | udpServer.Throttle.RequestedDripRate = totalBytes; | 256 | udpServer.Throttle.RequestedDripRate = totalBytes; |
257 | 257 | ||
258 | ScenePresence sp1 | 258 | ScenePresence sp1 |
259 | = ClientStackHelpers.AddChildClient( | 259 | = ClientStackHelpers.AddChildClient( |
260 | scene, udpServer, TestHelpers.ParseTail(0x1), TestHelpers.ParseTail(0x2), 123456); | 260 | scene, udpServer, TestHelpers.ParseTail(0x1), TestHelpers.ParseTail(0x2), 123456); |
261 | 261 | ||
@@ -265,8 +265,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests | |||
265 | udpClient1, resendBytes, landBytes, windBytes, cloudBytes, taskBytes, textureBytes, assetBytes); | 265 | udpClient1, resendBytes, landBytes, windBytes, cloudBytes, taskBytes, textureBytes, assetBytes); |
266 | 266 | ||
267 | AssertThrottles( | 267 | AssertThrottles( |
268 | udpClient1, | 268 | udpClient1, |
269 | resendBytes / 2, landBytes / 2, windBytes / 2, cloudBytes / 2, taskBytes / 2, | 269 | resendBytes / 2, landBytes / 2, windBytes / 2, cloudBytes / 2, taskBytes / 2, |
270 | textureBytes / 2, assetBytes / 2, totalBytes, 0, 0); | 270 | textureBytes / 2, assetBytes / 2, totalBytes, 0, 0); |
271 | 271 | ||
272 | // Test: Now add another client | 272 | // Test: Now add another client |
@@ -281,13 +281,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests | |||
281 | udpClient2, resendBytes, landBytes, windBytes, cloudBytes, taskBytes, textureBytes, assetBytes); | 281 | udpClient2, resendBytes, landBytes, windBytes, cloudBytes, taskBytes, textureBytes, assetBytes); |
282 | 282 | ||
283 | AssertThrottles( | 283 | AssertThrottles( |
284 | udpClient1, | 284 | udpClient1, |
285 | resendBytes / 4, landBytes / 4, windBytes / 4, cloudBytes / 4, taskBytes / 4, | 285 | resendBytes / 4, landBytes / 4, windBytes / 4, cloudBytes / 4, taskBytes / 4, |
286 | textureBytes / 4, assetBytes / 4, totalBytes / 2, 0, 0); | 286 | textureBytes / 4, assetBytes / 4, totalBytes / 2, 0, 0); |
287 | 287 | ||
288 | AssertThrottles( | 288 | AssertThrottles( |
289 | udpClient2, | 289 | udpClient2, |
290 | resendBytes / 4, landBytes / 4, windBytes / 4, cloudBytes / 4, taskBytes / 4, | 290 | resendBytes / 4, landBytes / 4, windBytes / 4, cloudBytes / 4, taskBytes / 4, |
291 | textureBytes / 4, assetBytes / 4, totalBytes / 2, 0, 0); | 291 | textureBytes / 4, assetBytes / 4, totalBytes / 2, 0, 0); |
292 | } | 292 | } |
293 | 293 | ||
@@ -307,14 +307,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests | |||
307 | int taskBytes = 12000; | 307 | int taskBytes = 12000; |
308 | int textureBytes = 14000; | 308 | int textureBytes = 14000; |
309 | int assetBytes = 16000; | 309 | int assetBytes = 16000; |
310 | int totalBytes | 310 | int totalBytes |
311 | = (int)((resendBytes + landBytes + windBytes + cloudBytes + taskBytes + textureBytes + assetBytes) / 2); | 311 | = (int)((resendBytes + landBytes + windBytes + cloudBytes + taskBytes + textureBytes + assetBytes) / 2); |
312 | 312 | ||
313 | Scene scene = new SceneHelpers().SetupScene(); | 313 | Scene scene = new SceneHelpers().SetupScene(); |
314 | TestLLUDPServer udpServer = ClientStackHelpers.AddUdpServer(scene); | 314 | TestLLUDPServer udpServer = ClientStackHelpers.AddUdpServer(scene); |
315 | udpServer.ThrottleRates.Total = totalBytes; | 315 | udpServer.ThrottleRates.Total = totalBytes; |
316 | 316 | ||
317 | ScenePresence sp | 317 | ScenePresence sp |
318 | = ClientStackHelpers.AddChildClient( | 318 | = ClientStackHelpers.AddChildClient( |
319 | scene, udpServer, TestHelpers.ParseTail(0x1), TestHelpers.ParseTail(0x2), 123456); | 319 | scene, udpServer, TestHelpers.ParseTail(0x1), TestHelpers.ParseTail(0x2), 123456); |
320 | 320 | ||
@@ -325,8 +325,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests | |||
325 | udpClient, resendBytes, landBytes, windBytes, cloudBytes, taskBytes, textureBytes, assetBytes); | 325 | udpClient, resendBytes, landBytes, windBytes, cloudBytes, taskBytes, textureBytes, assetBytes); |
326 | 326 | ||
327 | AssertThrottles( | 327 | AssertThrottles( |
328 | udpClient, | 328 | udpClient, |
329 | resendBytes / 2, landBytes / 2, windBytes / 2, cloudBytes / 2, taskBytes / 2, | 329 | resendBytes / 2, landBytes / 2, windBytes / 2, cloudBytes / 2, taskBytes / 2, |
330 | textureBytes / 2, assetBytes / 2, totalBytes, 0, totalBytes); | 330 | textureBytes / 2, assetBytes / 2, totalBytes, 0, totalBytes); |
331 | } | 331 | } |
332 | 332 | ||
@@ -352,7 +352,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests | |||
352 | udpServer.ThrottleRates.Total = (int)(totalBytes * 1.1); | 352 | udpServer.ThrottleRates.Total = (int)(totalBytes * 1.1); |
353 | udpServer.Throttle.RequestedDripRate = (int)(totalBytes * 1.5); | 353 | udpServer.Throttle.RequestedDripRate = (int)(totalBytes * 1.5); |
354 | 354 | ||
355 | ScenePresence sp1 | 355 | ScenePresence sp1 |
356 | = ClientStackHelpers.AddChildClient( | 356 | = ClientStackHelpers.AddChildClient( |
357 | scene, udpServer, TestHelpers.ParseTail(0x1), TestHelpers.ParseTail(0x2), 123456); | 357 | scene, udpServer, TestHelpers.ParseTail(0x1), TestHelpers.ParseTail(0x2), 123456); |
358 | 358 | ||
@@ -363,8 +363,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests | |||
363 | udpClient1, resendBytes, landBytes, windBytes, cloudBytes, taskBytes, textureBytes, assetBytes); | 363 | udpClient1, resendBytes, landBytes, windBytes, cloudBytes, taskBytes, textureBytes, assetBytes); |
364 | 364 | ||
365 | AssertThrottles( | 365 | AssertThrottles( |
366 | udpClient1, | 366 | udpClient1, |
367 | resendBytes, landBytes, windBytes, cloudBytes, taskBytes, | 367 | resendBytes, landBytes, windBytes, cloudBytes, taskBytes, |
368 | textureBytes, assetBytes, totalBytes, 0, totalBytes * 1.1); | 368 | textureBytes, assetBytes, totalBytes, 0, totalBytes * 1.1); |
369 | 369 | ||
370 | // Now add another client | 370 | // Now add another client |
@@ -379,25 +379,25 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests | |||
379 | udpClient2, resendBytes, landBytes, windBytes, cloudBytes, taskBytes, textureBytes, assetBytes); | 379 | udpClient2, resendBytes, landBytes, windBytes, cloudBytes, taskBytes, textureBytes, assetBytes); |
380 | 380 | ||
381 | AssertThrottles( | 381 | AssertThrottles( |
382 | udpClient1, | 382 | udpClient1, |
383 | resendBytes * 0.75, landBytes * 0.75, windBytes * 0.75, cloudBytes * 0.75, taskBytes * 0.75, | 383 | resendBytes * 0.75, landBytes * 0.75, windBytes * 0.75, cloudBytes * 0.75, taskBytes * 0.75, |
384 | textureBytes * 0.75, assetBytes * 0.75, totalBytes * 0.75, 0, totalBytes * 1.1); | 384 | textureBytes * 0.75, assetBytes * 0.75, totalBytes * 0.75, 0, totalBytes * 1.1); |
385 | 385 | ||
386 | AssertThrottles( | 386 | AssertThrottles( |
387 | udpClient2, | 387 | udpClient2, |
388 | resendBytes * 0.75, landBytes * 0.75, windBytes * 0.75, cloudBytes * 0.75, taskBytes * 0.75, | 388 | resendBytes * 0.75, landBytes * 0.75, windBytes * 0.75, cloudBytes * 0.75, taskBytes * 0.75, |
389 | textureBytes * 0.75, assetBytes * 0.75, totalBytes * 0.75, 0, totalBytes * 1.1); | 389 | textureBytes * 0.75, assetBytes * 0.75, totalBytes * 0.75, 0, totalBytes * 1.1); |
390 | } | 390 | } |
391 | 391 | ||
392 | private void AssertThrottles( | 392 | private void AssertThrottles( |
393 | LLUDPClient udpClient, | 393 | LLUDPClient udpClient, |
394 | double resendBytes, double landBytes, double windBytes, double cloudBytes, double taskBytes, double textureBytes, double assetBytes, | 394 | double resendBytes, double landBytes, double windBytes, double cloudBytes, double taskBytes, double textureBytes, double assetBytes, |
395 | double totalBytes, double targetBytes, double maxBytes) | 395 | double totalBytes, double targetBytes, double maxBytes) |
396 | { | 396 | { |
397 | ClientInfo ci = udpClient.GetClientInfo(); | 397 | ClientInfo ci = udpClient.GetClientInfo(); |
398 | 398 | ||
399 | // Console.WriteLine( | 399 | // Console.WriteLine( |
400 | // "Resend={0}, Land={1}, Wind={2}, Cloud={3}, Task={4}, Texture={5}, Asset={6}, TOTAL = {7}", | 400 | // "Resend={0}, Land={1}, Wind={2}, Cloud={3}, Task={4}, Texture={5}, Asset={6}, TOTAL = {7}", |
401 | // ci.resendThrottle, ci.landThrottle, ci.windThrottle, ci.cloudThrottle, ci.taskThrottle, ci.textureThrottle, ci.assetThrottle, ci.totalThrottle); | 401 | // ci.resendThrottle, ci.landThrottle, ci.windThrottle, ci.cloudThrottle, ci.taskThrottle, ci.textureThrottle, ci.assetThrottle, ci.totalThrottle); |
402 | 402 | ||
403 | Assert.AreEqual((int)resendBytes, ci.resendThrottle, "Resend"); | 403 | Assert.AreEqual((int)resendBytes, ci.resendThrottle, "Resend"); |