aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2010-11-17 19:58:27 +0000
committerJustin Clark-Casey (justincc)2010-11-17 22:55:19 +0000
commitc4f3175e173b399f533fc42be36631d97b696a5a (patch)
treea2520f740a9fce825a586a21c2b799a6dd432e41 /OpenSim/Region
parentFix "show queues" console command (diff)
downloadopensim-SC_OLD-c4f3175e173b399f533fc42be36631d97b696a5a.zip
opensim-SC_OLD-c4f3175e173b399f533fc42be36631d97b696a5a.tar.gz
opensim-SC_OLD-c4f3175e173b399f533fc42be36631d97b696a5a.tar.bz2
opensim-SC_OLD-c4f3175e173b399f533fc42be36631d97b696a5a.tar.xz
add "Unacked bytes" column to "show queues"
This should show the number of bytes sent to the client that it has not yet acknowledged.
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Application/OpenSim.cs18
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLUDPClient.cs3
2 files changed, 13 insertions, 8 deletions
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs
index c20a4e8..a90ce33 100644
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -306,7 +306,9 @@ namespace OpenSim
306 306
307 m_console.Commands.AddCommand("region", false, "show queues", 307 m_console.Commands.AddCommand("region", false, "show queues",
308 "show queues", 308 "show queues",
309 "Show queue data", HandleShow); 309 "Show queue data for each client",
310 HandleShow);
311
310 m_console.Commands.AddCommand("region", false, "show ratings", 312 m_console.Commands.AddCommand("region", false, "show ratings",
311 "show ratings", 313 "show ratings",
312 "Show rating data", HandleShow); 314 "Show rating data", HandleShow);
@@ -994,7 +996,7 @@ namespace OpenSim
994 int columnPadding = 2; 996 int columnPadding = 2;
995 int maxNameLength = 18; 997 int maxNameLength = 18;
996 int maxRegionNameLength = 14; 998 int maxRegionNameLength = 14;
997 int maxTypeLength = 5; 999 int maxTypeLength = 4;
998 int totalInfoFieldsLength = maxNameLength + columnPadding + maxRegionNameLength + columnPadding + maxTypeLength + columnPadding; 1000 int totalInfoFieldsLength = maxNameLength + columnPadding + maxRegionNameLength + columnPadding + maxTypeLength + columnPadding;
999 1001
1000 report.AppendFormat("{0,-" + maxNameLength + "}{1,-" + columnPadding + "}", "User", ""); 1002 report.AppendFormat("{0,-" + maxNameLength + "}{1,-" + columnPadding + "}", "User", "");
@@ -1002,7 +1004,7 @@ namespace OpenSim
1002 report.AppendFormat("{0,-" + maxTypeLength + "}{1,-" + columnPadding + "}", "Type", ""); 1004 report.AppendFormat("{0,-" + maxTypeLength + "}{1,-" + columnPadding + "}", "Type", "");
1003 1005
1004 report.AppendFormat( 1006 report.AppendFormat(
1005 "{0,9} {1,10} {2,8} {3,7} {4,7} {5,7} {6,7} {7,9} {8,7} {9,7}\n", 1007 "{0,9} {1,9} {2,9} {3,8} {4,7} {5,7} {6,7} {7,7} {8,9} {9,7} {10,7}\n",
1006 "Packets", 1008 "Packets",
1007 "Packets", 1009 "Packets",
1008 "Bytes", 1010 "Bytes",
@@ -1012,13 +1014,15 @@ namespace OpenSim
1012 "Bytes", 1014 "Bytes",
1013 "Bytes", 1015 "Bytes",
1014 "Bytes", 1016 "Bytes",
1017 "Bytes",
1015 "Bytes"); 1018 "Bytes");
1016 1019
1017 report.AppendFormat("{0,-" + totalInfoFieldsLength + "}", ""); 1020 report.AppendFormat("{0,-" + totalInfoFieldsLength + "}", "");
1018 report.AppendFormat( 1021 report.AppendFormat(
1019 "{0,9} {1,10} {2,8} {3,7} {4,7} {5,7} {6,7} {7,9} {8,7} {9,7}\n", 1022 "{0,9} {1,9} {2,9} {3,8} {4,7} {5,7} {6,7} {7,7} {8,9} {9,7} {10,7}\n",
1020 "Sent", 1023 "Out",
1021 "Received", 1024 "In",
1025 "Unacked",
1022 "Resend", 1026 "Resend",
1023 "Land", 1027 "Land",
1024 "Wind", 1028 "Wind",
@@ -1047,7 +1051,7 @@ namespace OpenSim
1047 regionName.Length > maxRegionNameLength ? regionName.Substring(0, maxRegionNameLength) : regionName, ""); 1051 regionName.Length > maxRegionNameLength ? regionName.Substring(0, maxRegionNameLength) : regionName, "");
1048 report.AppendFormat( 1052 report.AppendFormat(
1049 "{0,-" + maxTypeLength + "}{1,-" + columnPadding + "}", 1053 "{0,-" + maxTypeLength + "}{1,-" + columnPadding + "}",
1050 scene.PresenceChildStatus(client.AgentId) ? "Child" : "Root", ""); 1054 scene.PresenceChildStatus(client.AgentId) ? "Cd" : "Rt", "");
1051 1055
1052 IStatsCollector stats = (IStatsCollector)client; 1056 IStatsCollector stats = (IStatsCollector)client;
1053 1057
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUDPClient.cs b/OpenSim/Region/ClientStack/LindenUDP/LLUDPClient.cs
index 1812c08..c4db5da 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLUDPClient.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLUDPClient.cs
@@ -256,9 +256,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
256 public string GetStats() 256 public string GetStats()
257 { 257 {
258 return string.Format( 258 return string.Format(
259 "{0,9} {1,10} {2,8} {3,7} {4,7} {5,7} {6,7} {7,9} {8,7} {9,7}", 259 "{0,9} {1,9} {2,9} {3,8} {4,7} {5,7} {6,7} {7,7} {8,9} {9,7} {10,7}",
260 PacketsSent, 260 PacketsSent,
261 PacketsReceived, 261 PacketsReceived,
262 UnackedBytes,
262 m_throttleCategories[(int)ThrottleOutPacketType.Resend].Content, 263 m_throttleCategories[(int)ThrottleOutPacketType.Resend].Content,
263 m_throttleCategories[(int)ThrottleOutPacketType.Land].Content, 264 m_throttleCategories[(int)ThrottleOutPacketType.Land].Content,
264 m_throttleCategories[(int)ThrottleOutPacketType.Wind].Content, 265 m_throttleCategories[(int)ThrottleOutPacketType.Wind].Content,