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

Correct "show queues" to show queued packet numbers for each client instead of bytes. 

Byte amounts aren't actually available - this was a misunderstanding of TokenBucket.Content.  But raw packet numbers are.
viewer-2-initial-appearance
Justin Clark-Casey (justincc) 2011-01-19 00:33:25 +00:00
parent 9f7b37b37c
commit 7f000ea88e
2 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1014,22 +1014,22 @@ namespace OpenSim
report.AppendFormat("{0,-" + maxTypeLength + "}{1,-" + columnPadding + "}", "Type", ""); report.AppendFormat("{0,-" + maxTypeLength + "}{1,-" + columnPadding + "}", "Type", "");
report.AppendFormat( report.AppendFormat(
"{0,9} {1,9} {2,9} {3,8} {4,7} {5,7} {6,7} {7,7} {8,9} {9,7} {10,7}\n", "{0,7} {1,7} {2,9} {3,8} {4,7} {5,7} {6,7} {7,7} {8,9} {9,7} {10,7}\n",
"Packets", "Pkts",
"Packets", "Pkts",
"Bytes", "Bytes",
"Bytes", "Pkts",
"Bytes", "Pkts",
"Bytes", "Pkts",
"Bytes", "Pkts",
"Bytes", "Pkts",
"Bytes", "Pkts",
"Bytes", "Pkts",
"Bytes"); "Pkts");
report.AppendFormat("{0,-" + totalInfoFieldsLength + "}", ""); report.AppendFormat("{0,-" + totalInfoFieldsLength + "}", "");
report.AppendFormat( report.AppendFormat(
"{0,9} {1,9} {2,9} {3,8} {4,7} {5,7} {6,7} {7,7} {8,9} {9,7} {10,7}\n", "{0,7} {1,7} {2,9} {3,8} {4,7} {5,7} {6,7} {7,7} {8,9} {9,7} {10,7}\n",
"Out", "Out",
"In", "In",
"Unacked", "Unacked",

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

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