diff options
author | Justin Clark-Casey (justincc) | 2014-10-21 02:17:38 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2014-11-25 23:22:19 +0000 |
commit | 61d6bd78b35f42ef3d66932d443868922419c975 (patch) | |
tree | 233d4317e55b637114ff7c51ba0c9f3b2421ad3b /OpenSim/Region/ClientStack/Linden | |
parent | Add "debug lludp get/set new-client-throttle-max" to allow default new client... (diff) | |
download | opensim-SC_OLD-61d6bd78b35f42ef3d66932d443868922419c975.zip opensim-SC_OLD-61d6bd78b35f42ef3d66932d443868922419c975.tar.gz opensim-SC_OLD-61d6bd78b35f42ef3d66932d443868922419c975.tar.bz2 opensim-SC_OLD-61d6bd78b35f42ef3d66932d443868922419c975.tar.xz |
Change the word order of some debug lludp settings for readability
On server, scene-throttle-max becomes max-scene-throttle and likewise max-new-client-throttle
On clients, throttle-max becomes max
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden')
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/LLUDPServerCommands.cs | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServerCommands.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServerCommands.cs index 63e620a..b03d639 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServerCommands.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServerCommands.cs | |||
@@ -142,8 +142,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
142 | "debug lludp throttles get", | 142 | "debug lludp throttles get", |
143 | "debug lludp throttles get [<avatar-first-name> <avatar-last-name>]", | 143 | "debug lludp throttles get [<avatar-first-name> <avatar-last-name>]", |
144 | "Return debug settings for throttles.", | 144 | "Return debug settings for throttles.", |
145 | "adaptive - true/false, controls adaptive throttle setting.\n" | 145 | "adaptive - true/false, controls adaptive throttle setting.\n" |
146 | + "throttle-max - the max kbps throttle allowed for the specified existing clients. Use 'debug lludp get new-client-throttle-max' to see the setting for new clients.\n", | 146 | + "max - the max kbps throttle allowed for the specified existing clients. Use 'debug lludp get new-client-throttle-max' to see the setting for new clients.\n", |
147 | HandleThrottleGetCommand); | 147 | HandleThrottleGetCommand); |
148 | 148 | ||
149 | m_console.Commands.AddCommand( | 149 | m_console.Commands.AddCommand( |
@@ -152,8 +152,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
152 | "debug lludp throttles set", | 152 | "debug lludp throttles set", |
153 | "debug lludp throttles set <param> <value> [<avatar-first-name> <avatar-last-name>]", | 153 | "debug lludp throttles set <param> <value> [<avatar-first-name> <avatar-last-name>]", |
154 | "Set a throttle parameter for the given client.", | 154 | "Set a throttle parameter for the given client.", |
155 | "adaptive - true/false, controls adaptive throttle setting.\n" | 155 | "adaptive - true/false, controls adaptive throttle setting.\n" |
156 | + "throttle-max - the max kbps throttle allowed for the specified existing clients. Use 'debug lludp set new-client-throttle-max' to change the settings for new clients.\n", | 156 | + "max - the max kbps throttle allowed for the specified existing clients. Use 'debug lludp set new-client-throttle-max' to change the settings for new clients.\n", |
157 | HandleThrottleSetCommand); | 157 | HandleThrottleSetCommand); |
158 | 158 | ||
159 | m_console.Commands.AddCommand( | 159 | m_console.Commands.AddCommand( |
@@ -162,8 +162,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
162 | "debug lludp get", | 162 | "debug lludp get", |
163 | "debug lludp get", | 163 | "debug lludp get", |
164 | "Get debug parameters for the server.", | 164 | "Get debug parameters for the server.", |
165 | "scene-throttle-max - the current max cumulative kbps provided for this scene to clients.\n" | 165 | "max-scene-throttle - the current max cumulative kbps provided for this scene to clients.\n" |
166 | + "new-client-throttle-max - the max kbps throttle allowed to new clients. Use 'debug lludp throttles set' to see the settings for existing clients.", | 166 | + "max-new-client-throttle - the max kbps throttle allowed to new clients. Use 'debug lludp throttles get max' to see the settings for existing clients.", |
167 | HandleGetCommand); | 167 | HandleGetCommand); |
168 | 168 | ||
169 | m_console.Commands.AddCommand( | 169 | m_console.Commands.AddCommand( |
@@ -172,8 +172,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
172 | "debug lludp set", | 172 | "debug lludp set", |
173 | "debug lludp set <param> <value>", | 173 | "debug lludp set <param> <value>", |
174 | "Set a parameter for the server.", | 174 | "Set a parameter for the server.", |
175 | "scene-throttle-max - the current max cumulative kbps provided for this scene to clients.\n" | 175 | "max-scene-throttle - the current max cumulative kbps provided for this scene to clients.\n" |
176 | + "new-client-throttle-max - the max kbps throttle allowed to each new client. Use 'debug lludp throttles set' to set for existing clients.", | 176 | + "max-new-client-throttle - the max kbps throttle allowed to each new client. Use 'debug lludp throttles set max' to set for existing clients.", |
177 | HandleSetCommand); | 177 | HandleSetCommand); |
178 | 178 | ||
179 | m_console.Commands.AddCommand( | 179 | m_console.Commands.AddCommand( |
@@ -378,7 +378,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
378 | } | 378 | } |
379 | }); | 379 | }); |
380 | } | 380 | } |
381 | else if (param == "throttle-max") | 381 | else if (param == "max") |
382 | { | 382 | { |
383 | int newValue; | 383 | int newValue; |
384 | if (!ConsoleUtil.TryParseConsoleInt(MainConsole.Instance, rawValue, out newValue)) | 384 | if (!ConsoleUtil.TryParseConsoleInt(MainConsole.Instance, rawValue, out newValue)) |
@@ -436,8 +436,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
436 | LLUDPClient udpClient = ((LLClientView)sp.ControllingClient).UDPClient; | 436 | LLUDPClient udpClient = ((LLClientView)sp.ControllingClient).UDPClient; |
437 | 437 | ||
438 | ConsoleDisplayList cdl = new ConsoleDisplayList(); | 438 | ConsoleDisplayList cdl = new ConsoleDisplayList(); |
439 | cdl.AddRow("Adaptive throttle", udpClient.FlowThrottle.AdaptiveEnabled); | 439 | cdl.AddRow("adaptive", udpClient.FlowThrottle.AdaptiveEnabled); |
440 | cdl.AddRow("Max throttle", string.Format("{0} kbps", udpClient.FlowThrottle.MaxDripRate * 8 / 1000)); | 440 | cdl.AddRow("max", string.Format("{0} kbps", udpClient.FlowThrottle.MaxDripRate * 8 / 1000)); |
441 | 441 | ||
442 | m_console.Output(cdl.ToString()); | 442 | m_console.Output(cdl.ToString()); |
443 | } | 443 | } |
@@ -454,12 +454,12 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
454 | 454 | ||
455 | long maxSceneDripRate = m_udpServer.Throttle.MaxDripRate; | 455 | long maxSceneDripRate = m_udpServer.Throttle.MaxDripRate; |
456 | cdl.AddRow( | 456 | cdl.AddRow( |
457 | "scene-throttle-max", | 457 | "max-scene-throttle", |
458 | maxSceneDripRate != 0 ? string.Format("{0} kbps", maxSceneDripRate * 8 / 1000) : "unset"); | 458 | maxSceneDripRate != 0 ? string.Format("{0} kbps", maxSceneDripRate * 8 / 1000) : "unset"); |
459 | 459 | ||
460 | int maxClientDripRate = m_udpServer.ThrottleRates.Total; | 460 | int maxClientDripRate = m_udpServer.ThrottleRates.Total; |
461 | cdl.AddRow( | 461 | cdl.AddRow( |
462 | "new-client-throttle-max", | 462 | "max-new-client-throttle", |
463 | maxClientDripRate != 0 ? string.Format("{0} kbps", maxClientDripRate * 8 / 1000) : "unset"); | 463 | maxClientDripRate != 0 ? string.Format("{0} kbps", maxClientDripRate * 8 / 1000) : "unset"); |
464 | 464 | ||
465 | m_console.Output(cdl.ToString()); | 465 | m_console.Output(cdl.ToString()); |
@@ -481,14 +481,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
481 | 481 | ||
482 | int newValue; | 482 | int newValue; |
483 | 483 | ||
484 | if (param == "scene-throttle-max") | 484 | if (param == "max-scene-throttle") |
485 | { | 485 | { |
486 | if (!ConsoleUtil.TryParseConsoleInt(MainConsole.Instance, rawValue, out newValue)) | 486 | if (!ConsoleUtil.TryParseConsoleInt(MainConsole.Instance, rawValue, out newValue)) |
487 | return; | 487 | return; |
488 | 488 | ||
489 | m_udpServer.Throttle.RequestedDripRate = newValue * 1000 / 8; | 489 | m_udpServer.Throttle.RequestedDripRate = newValue * 1000 / 8; |
490 | } | 490 | } |
491 | else if (param == "new-client-throttle-max") | 491 | else if (param == "max-new-client-throttle") |
492 | { | 492 | { |
493 | if (!ConsoleUtil.TryParseConsoleInt(MainConsole.Instance, rawValue, out newValue)) | 493 | if (!ConsoleUtil.TryParseConsoleInt(MainConsole.Instance, rawValue, out newValue)) |
494 | return; | 494 | return; |