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

properly format "show throttles" table

viewer-2-initial-appearance
Justin Clark-Casey (justincc) 2011-01-21 22:31:46 +00:00
parent 38debbc59f
commit 9971fdbcd5
1 changed files with 55 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs
View File

@ -231,10 +231,36 @@ namespace OpenSim.Region.CoreModules.UDP.Linden
int maxNameLength = 18; int maxNameLength = 18;
int maxRegionNameLength = 14; int maxRegionNameLength = 14;
int maxTypeLength = 4; int maxTypeLength = 4;
int totalInfoFieldsLength = maxNameLength + columnPadding + maxRegionNameLength + columnPadding + maxTypeLength + columnPadding;
report.Append(GetColumnEntry("User", maxNameLength, columnPadding)); report.Append(GetColumnEntry("User", maxNameLength, columnPadding));
report.Append(GetColumnEntry("Region", maxRegionNameLength, columnPadding)); report.Append(GetColumnEntry("Region", maxRegionNameLength, columnPadding));
report.Append(GetColumnEntry("Type\n", maxTypeLength, columnPadding)); report.Append(GetColumnEntry("Type", maxTypeLength, columnPadding));
report.AppendFormat(
"{0,7} {1,8} {2,7} {3,7} {4,7} {5,7} {6,9} {7,7}\n",
"Total",
"Resend",
"Land",
"Wind",
"Cloud",
"Task",
"Texture",
"Asset");
report.AppendFormat("{0,-" + totalInfoFieldsLength + "}", "");
report.AppendFormat(
"{0,7} {1,8} {2,7} {3,7} {4,7} {5,7} {6,9} {7,7}",
"kb/s",
"kb/s",
"kb/s",
"kb/s",
"kb/s",
"kb/s",
"kb/s",
"kb/s");
report.AppendLine();
bool firstClient = true; bool firstClient = true;
@ -251,7 +277,7 @@ namespace OpenSim.Region.CoreModules.UDP.Linden
if (firstClient) if (firstClient)
{ {
report.AppendLine(GetServerThrottlesReport(llClient.UDPServer, scene)); report.AppendLine(GetServerThrottlesReport(llClient.UDPServer));
firstClient = false; firstClient = false;
} }
@ -269,14 +295,16 @@ namespace OpenSim.Region.CoreModules.UDP.Linden
report.Append(GetColumnEntry(regionName, maxRegionNameLength, columnPadding)); report.Append(GetColumnEntry(regionName, maxRegionNameLength, columnPadding));
report.Append(GetColumnEntry(isChild ? "Cd" : "Rt", maxTypeLength, columnPadding)); report.Append(GetColumnEntry(isChild ? "Cd" : "Rt", maxTypeLength, columnPadding));
report.Append((ci.totalThrottle * 8) / 1000 + " "); report.AppendFormat(
report.Append((ci.resendThrottle * 8) / 1000 + " "); "{0,7} {1,8} {2,7} {3,7} {4,7} {5,7} {6,9} {7,7}\n",
report.Append((ci.landThrottle * 8) / 1000 + " "); (ci.totalThrottle * 8) / 1000,
report.Append((ci.windThrottle * 8) / 1000 + " "); (ci.resendThrottle * 8) / 1000,
report.Append((ci.cloudThrottle * 8) / 1000 + " "); (ci.landThrottle * 8) / 1000,
report.Append((ci.taskThrottle * 8) / 1000 + " "); (ci.windThrottle * 8) / 1000,
report.Append((ci.textureThrottle * 8) / 1000 + " "); (ci.cloudThrottle * 8) / 1000,
report.Append((ci.assetThrottle * 8) / 1000 + " "); (ci.taskThrottle * 8) / 1000,
(ci.textureThrottle * 8) / 1000,
(ci.assetThrottle * 8) / 1000);
report.AppendLine(); report.AppendLine();
} }
@ -287,7 +315,7 @@ namespace OpenSim.Region.CoreModules.UDP.Linden
return report.ToString(); return report.ToString();
} }
protected string GetServerThrottlesReport(LLUDPServer udpServer, Scene scene) protected string GetServerThrottlesReport(LLUDPServer udpServer)
{ {
StringBuilder report = new StringBuilder(); StringBuilder report = new StringBuilder();
@ -296,22 +324,23 @@ namespace OpenSim.Region.CoreModules.UDP.Linden
int maxRegionNameLength = 14; int maxRegionNameLength = 14;
int maxTypeLength = 4; int maxTypeLength = 4;
string name = "SERVER LIMITS"; string name = "SERVER AGENT LIMITS";
string regionName = scene.RegionInfo.RegionName;
report.Append(GetColumnEntry(name, maxNameLength, columnPadding)); report.Append(GetColumnEntry(name, maxNameLength, columnPadding));
report.Append(GetColumnEntry(regionName, maxRegionNameLength, columnPadding)); report.Append(GetColumnEntry("-", maxRegionNameLength, columnPadding));
report.Append(GetColumnEntry("n/a", maxTypeLength, columnPadding)); report.Append(GetColumnEntry("-", maxTypeLength, columnPadding));
ThrottleRates throttleRates = udpServer.ThrottleRates; ThrottleRates throttleRates = udpServer.ThrottleRates;
report.Append("n/a "); report.AppendFormat(
report.Append((throttleRates.ResendLimit * 8) / 1000 + " "); "{0,7} {1,8} {2,7} {3,7} {4,7} {5,7} {6,9} {7,7}",
report.Append((throttleRates.LandLimit * 8) / 1000 + " "); "n/a",
report.Append((throttleRates.WindLimit * 8) / 1000 + " "); (throttleRates.ResendLimit * 8) / 1000,
report.Append((throttleRates.CloudLimit * 8) / 1000 + " "); (throttleRates.LandLimit * 8) / 1000,
report.Append((throttleRates.TaskLimit * 8) / 1000 + " "); (throttleRates.WindLimit * 8) / 1000,
report.Append((throttleRates.TextureLimit * 8) / 1000 + " "); (throttleRates.CloudLimit * 8) / 1000,
report.Append((throttleRates.AssetLimit * 8) / 1000 + " "); (throttleRates.TaskLimit * 8) / 1000,
(throttleRates.TextureLimit * 8) / 1000,
(throttleRates.AssetLimit * 8) / 1000);
return report.ToString(); return report.ToString();
} }