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

add "Unacked bytes" column to "show queues" 

This should show the number of bytes sent to the client that it has not yet acknowledged.
viewer-2-initial-appearance
Justin Clark-Casey (justincc) 2010-11-17 19:58:27 +00:00
parent 2a17c39dfe
commit c4f3175e17
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
OpenSim/Region/Application/OpenSim.cs
View File

@ -306,7 +306,9 @@ namespace OpenSim
m_console.Commands.AddCommand("region", false, "show queues", m_console.Commands.AddCommand("region", false, "show queues",
"show queues", "show queues",
"Show queue data", HandleShow); "Show queue data for each client",
HandleShow);
m_console.Commands.AddCommand("region", false, "show ratings", m_console.Commands.AddCommand("region", false, "show ratings",
"show ratings", "show ratings",
"Show rating data", HandleShow); "Show rating data", HandleShow);
@ -994,7 +996,7 @@ namespace OpenSim
int columnPadding = 2; int columnPadding = 2;
int maxNameLength = 18; int maxNameLength = 18;
int maxRegionNameLength = 14; int maxRegionNameLength = 14;
int maxTypeLength = 5; int maxTypeLength = 4;
int totalInfoFieldsLength = maxNameLength + columnPadding + maxRegionNameLength + columnPadding + maxTypeLength + columnPadding; int totalInfoFieldsLength = maxNameLength + columnPadding + maxRegionNameLength + columnPadding + maxTypeLength + columnPadding;
report.AppendFormat("{0,-" + maxNameLength + "}{1,-" + columnPadding + "}", "User", ""); report.AppendFormat("{0,-" + maxNameLength + "}{1,-" + columnPadding + "}", "User", "");
@ -1002,7 +1004,7 @@ namespace OpenSim
report.AppendFormat("{0,-" + maxTypeLength + "}{1,-" + columnPadding + "}", "Type", ""); report.AppendFormat("{0,-" + maxTypeLength + "}{1,-" + columnPadding + "}", "Type", "");
report.AppendFormat( report.AppendFormat(
"{0,9} {1,10} {2,8} {3,7} {4,7} {5,7} {6,7} {7,9} {8,7} {9,7}\n", "{0,9} {1,9} {2,9} {3,8} {4,7} {5,7} {6,7} {7,7} {8,9} {9,7} {10,7}\n",
"Packets", "Packets",
"Packets", "Packets",
"Bytes", "Bytes",
@ -1012,13 +1014,15 @@ namespace OpenSim
"Bytes", "Bytes",
"Bytes", "Bytes",
"Bytes", "Bytes",
"Bytes",
"Bytes"); "Bytes");
report.AppendFormat("{0,-" + totalInfoFieldsLength + "}", ""); report.AppendFormat("{0,-" + totalInfoFieldsLength + "}", "");
report.AppendFormat( report.AppendFormat(
"{0,9} {1,10} {2,8} {3,7} {4,7} {5,7} {6,7} {7,9} {8,7} {9,7}\n", "{0,9} {1,9} {2,9} {3,8} {4,7} {5,7} {6,7} {7,7} {8,9} {9,7} {10,7}\n",
"Sent", "Out",
"Received", "In",
"Unacked",
"Resend", "Resend",
"Land", "Land",
"Wind", "Wind",
@ -1047,7 +1051,7 @@ namespace OpenSim
regionName.Length > maxRegionNameLength ? regionName.Substring(0, maxRegionNameLength) : regionName, ""); regionName.Length > maxRegionNameLength ? regionName.Substring(0, maxRegionNameLength) : regionName, "");
report.AppendFormat( report.AppendFormat(
"{0,-" + maxTypeLength + "}{1,-" + columnPadding + "}", "{0,-" + maxTypeLength + "}{1,-" + columnPadding + "}",
scene.PresenceChildStatus(client.AgentId) ? "Child" : "Root", ""); scene.PresenceChildStatus(client.AgentId) ? "Cd" : "Rt", "");
IStatsCollector stats = (IStatsCollector)client; IStatsCollector stats = (IStatsCollector)client;

3
OpenSim/Region/ClientStack/LindenUDP/LLUDPClient.cs
View File

@ -256,9 +256,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
public string GetStats() public string GetStats()
{ {
return string.Format( return string.Format(
"{0,9} {1,10} {2,8} {3,7} {4,7} {5,7} {6,7} {7,9} {8,7} {9,7}", "{0,9} {1,9} {2,9} {3,8} {4,7} {5,7} {6,7} {7,7} {8,9} {9,7} {10,7}",
PacketsSent, PacketsSent,
PacketsReceived, PacketsReceived,
UnackedBytes,
m_throttleCategories[(int)ThrottleOutPacketType.Resend].Content, m_throttleCategories[(int)ThrottleOutPacketType.Resend].Content,
m_throttleCategories[(int)ThrottleOutPacketType.Land].Content, m_throttleCategories[(int)ThrottleOutPacketType.Land].Content,
m_throttleCategories[(int)ThrottleOutPacketType.Wind].Content, m_throttleCategories[(int)ThrottleOutPacketType.Wind].Content,