aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Application')
-rw-r--r--OpenSim/Region/Application/OpenSim.cs99
1 files changed, 0 insertions, 99 deletions
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs
index 1832c3d..00a97be 100644
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -301,13 +301,6 @@ namespace OpenSim
301 m_console.Commands.AddCommand("region", false, "show regions", 301 m_console.Commands.AddCommand("region", false, "show regions",
302 "show regions", 302 "show regions",
303 "Show region data", HandleShow); 303 "Show region data", HandleShow);
304
305 m_console.Commands.AddCommand("region", false, "show queues",
306 "show queues [full]",
307 "Show queue data for each client",
308 "Without the 'full' option, only users actually on the region are shown."
309 + " With the 'full' option child agents of users in neighbouring regions are also shown.",
310 HandleShow);
311 304
312 m_console.Commands.AddCommand("region", false, "show ratings", 305 m_console.Commands.AddCommand("region", false, "show ratings",
313 "show ratings", 306 "show ratings",
@@ -951,10 +944,6 @@ namespace OpenSim
951 }); 944 });
952 break; 945 break;
953 946
954 case "queues":
955 Notice(GetQueuesReport(showParams));
956 break;
957
958 case "ratings": 947 case "ratings":
959 m_sceneManager.ForEachScene( 948 m_sceneManager.ForEachScene(
960 delegate(Scene scene) 949 delegate(Scene scene)
@@ -982,94 +971,6 @@ namespace OpenSim
982 } 971 }
983 972
984 /// <summary> 973 /// <summary>
985 /// Generate UDP Queue data report for each client
986 /// </summary>
987 /// <param name="showParams"></param>
988 /// <returns></returns>
989 private string GetQueuesReport(string[] showParams)
990 {
991 bool showChildren = false;
992
993 if (showParams.Length > 1 && showParams[1] == "full")
994 showChildren = true;
995
996 StringBuilder report = new StringBuilder();
997
998 int columnPadding = 2;
999 int maxNameLength = 18;
1000 int maxRegionNameLength = 14;
1001 int maxTypeLength = 4;
1002 int totalInfoFieldsLength = maxNameLength + columnPadding + maxRegionNameLength + columnPadding + maxTypeLength + columnPadding;
1003
1004 report.AppendFormat("{0,-" + maxNameLength + "}{1,-" + columnPadding + "}", "User", "");
1005 report.AppendFormat("{0,-" + maxRegionNameLength + "}{1,-" + columnPadding + "}", "Region", "");
1006 report.AppendFormat("{0,-" + maxTypeLength + "}{1,-" + columnPadding + "}", "Type", "");
1007
1008 report.AppendFormat(
1009 "{0,7} {1,7} {2,9} {3,8} {4,7} {5,7} {6,7} {7,7} {8,9} {9,7} {10,7}\n",
1010 "Pkts",
1011 "Pkts",
1012 "Bytes",
1013 "Pkts",
1014 "Pkts",
1015 "Pkts",
1016 "Pkts",
1017 "Pkts",
1018 "Pkts",
1019 "Pkts",
1020 "Pkts");
1021
1022 report.AppendFormat("{0,-" + totalInfoFieldsLength + "}", "");
1023 report.AppendFormat(
1024 "{0,7} {1,7} {2,9} {3,8} {4,7} {5,7} {6,7} {7,7} {8,9} {9,7} {10,7}\n",
1025 "Out",
1026 "In",
1027 "Unacked",
1028 "Resend",
1029 "Land",
1030 "Wind",
1031 "Cloud",
1032 "Task",
1033 "Texture",
1034 "Asset",
1035 "State");
1036
1037 m_sceneManager.ForEachScene(
1038 delegate(Scene scene)
1039 {
1040 scene.ForEachClient(
1041 delegate(IClientAPI client)
1042 {
1043 if (client is IStatsCollector)
1044 {
1045 bool isChild = scene.PresenceChildStatus(client.AgentId);
1046 if (isChild && !showChildren)
1047 return;
1048
1049 string name = client.Name;
1050 string regionName = scene.RegionInfo.RegionName;
1051
1052 report.AppendFormat(
1053 "{0,-" + maxNameLength + "}{1,-" + columnPadding + "}",
1054 name.Length > maxNameLength ? name.Substring(0, maxNameLength) : name, "");
1055 report.AppendFormat(
1056 "{0,-" + maxRegionNameLength + "}{1,-" + columnPadding + "}",
1057 regionName.Length > maxRegionNameLength ? regionName.Substring(0, maxRegionNameLength) : regionName, "");
1058 report.AppendFormat(
1059 "{0,-" + maxTypeLength + "}{1,-" + columnPadding + "}",
1060 isChild ? "Cd" : "Rt", "");
1061
1062 IStatsCollector stats = (IStatsCollector)client;
1063
1064 report.AppendLine(stats.Report());
1065 }
1066 });
1067 });
1068
1069 return report.ToString();
1070 }
1071
1072 /// <summary>
1073 /// Use XML2 format to serialize data to a file 974 /// Use XML2 format to serialize data to a file
1074 /// </summary> 975 /// </summary>
1075 /// <param name="module"></param> 976 /// <param name="module"></param>