OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix console set and get of max scene rate. Was performing wrong calculation - throttle buckets are set in bytes, not bits

mb-throttle-test
Justin Clark-Casey (justincc) 2014-10-07 01:08:22 +01:00
parent 10d09e287c
commit d20aeefef2
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
OpenSim/Region/ClientStack/Linden/UDP/LLUDPServerCommands.cs
View File

@ -159,7 +159,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
"debug lludp set", "debug lludp set",
"debug lludp set <param> <value>", "debug lludp set <param> <value>",
"Set a parameter for the server.", "Set a parameter for the server.",
"Only current setting is 'scene-throttle-max' which sets the current max cumulative kbit/s provided for this scene to clients", "Only current setting is 'scene-throttle-max' which sets the current max cumulative kbps provided for this scene to clients",
HandleSetCommand); HandleSetCommand);
m_console.Commands.AddCommand( m_console.Commands.AddCommand(
@ -181,7 +181,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
cdl.AddRow("Adaptive throttles", m_udpServer.ThrottleRates.AdaptiveThrottlesEnabled); cdl.AddRow("Adaptive throttles", m_udpServer.ThrottleRates.AdaptiveThrottlesEnabled);
cdl.AddRow( cdl.AddRow(
"Max scene throttle", "Max scene throttle",
m_udpServer.MaxTotalDripRate != 0 ? string.Format("{0} kbit", m_udpServer.MaxTotalDripRate / 8 / 1000) : "unset"); m_udpServer.MaxTotalDripRate != 0 ? string.Format("{0} kbps", m_udpServer.MaxTotalDripRate * 8 / 1000) : "unset");
m_console.Output(cdl.ToString()); m_console.Output(cdl.ToString());
@ -418,7 +418,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
if (!ConsoleUtil.TryParseConsoleInt(MainConsole.Instance, rawValue, out newValue)) if (!ConsoleUtil.TryParseConsoleInt(MainConsole.Instance, rawValue, out newValue))
return; return;
m_udpServer.Throttle.RequestedDripRate = newValue * 8 * 1000; m_udpServer.Throttle.RequestedDripRate = newValue * 1000 / 8;
} }
m_console.OutputFormat("{0} set to {1} in {2}", param, rawValue, m_udpServer.Scene.Name); m_console.OutputFormat("{0} set to {1} in {2}", param, rawValue, m_udpServer.Scene.Name);