diff options
author | Justin Clark-Casey (justincc) | 2014-10-25 02:09:37 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2014-11-25 23:22:20 +0000 |
commit | b2e377f168967f7cedb32f077ee54b9f92439205 (patch) | |
tree | e6904f3c5a57a0334dd59c4164826c6dda0e1f69 /OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs | |
parent | Add request drip rate to assertions for token bucket regression tests (diff) | |
download | opensim-SC_OLD-b2e377f168967f7cedb32f077ee54b9f92439205.zip opensim-SC_OLD-b2e377f168967f7cedb32f077ee54b9f92439205.tar.gz opensim-SC_OLD-b2e377f168967f7cedb32f077ee54b9f92439205.tar.bz2 opensim-SC_OLD-b2e377f168967f7cedb32f077ee54b9f92439205.tar.xz |
Fix setting of max scene throttle so that setting it restricts the child client throttles properly.
In "show throttles", also renames 'total' column to 'actual' to reflect that it is not necessarily the throttles requested for/by the client.
Also fills out 'target' in non-adapative mode to the actual throttle requested for/by the client.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs b/OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs index f6772a5..08d0fbf 100644 --- a/OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs +++ b/OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs | |||
@@ -490,7 +490,7 @@ namespace OpenSim.Region.OptionalModules.UDP.Linden | |||
490 | "{0,8} {1,8} {2,7} {3,8} {4,7} {5,7} {6,7} {7,7} {8,9} {9,7}\n", | 490 | "{0,8} {1,8} {2,7} {3,8} {4,7} {5,7} {6,7} {7,7} {8,9} {9,7}\n", |
491 | "Max", | 491 | "Max", |
492 | "Target", | 492 | "Target", |
493 | "Total", | 493 | "Actual", |
494 | "Resend", | 494 | "Resend", |
495 | "Land", | 495 | "Land", |
496 | "Wind", | 496 | "Wind", |
@@ -546,7 +546,9 @@ namespace OpenSim.Region.OptionalModules.UDP.Linden | |||
546 | report.AppendFormat( | 546 | report.AppendFormat( |
547 | "{0,8} {1,8} {2,7} {3,8} {4,7} {5,7} {6,7} {7,7} {8,9} {9,7}\n", | 547 | "{0,8} {1,8} {2,7} {3,8} {4,7} {5,7} {6,7} {7,7} {8,9} {9,7}\n", |
548 | ci.maxThrottle > 0 ? ((ci.maxThrottle * 8) / 1000).ToString() : "-", | 548 | ci.maxThrottle > 0 ? ((ci.maxThrottle * 8) / 1000).ToString() : "-", |
549 | llUdpClient.FlowThrottle.AdaptiveEnabled ? ((ci.targetThrottle * 8) / 1000).ToString() : "-", | 549 | llUdpClient.FlowThrottle.AdaptiveEnabled |
550 | ? ((ci.targetThrottle * 8) / 1000).ToString() | ||
551 | : (llUdpClient.FlowThrottle.TotalDripRequest * 8 / 1000).ToString(), | ||
550 | (ci.totalThrottle * 8) / 1000, | 552 | (ci.totalThrottle * 8) / 1000, |
551 | (ci.resendThrottle * 8) / 1000, | 553 | (ci.resendThrottle * 8) / 1000, |
552 | (ci.landThrottle * 8) / 1000, | 554 | (ci.landThrottle * 8) / 1000, |