From 2a17c39dfe97b0637aab9f24b7152d5080da0969 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 17 Nov 2010 19:39:12 +0000
Subject: Fix "show queues" console command
For each agent, this command shows how many packets have been sent/received and how many bytes remain in each of the send queues (resend, land, texture, etc.)
Sometimes useful for diagnostics
---
OpenSim/Region/Application/OpenSim.cs | 101 +++++++++++++++++++++++-----------
1 file changed, 69 insertions(+), 32 deletions(-)
(limited to 'OpenSim/Region/Application')
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs
index f80cb34..c20a4e8 100644
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -30,6 +30,7 @@ using System.Collections;
using System.Collections.Generic;
using System.IO;
using System.Reflection;
+using System.Text;
using System.Timers;
using log4net;
using Nini.Config;
@@ -988,38 +989,74 @@ namespace OpenSim
///
private string GetQueuesReport()
{
- string report = String.Empty;
-
- m_sceneManager.ForEachScene(delegate(Scene scene)
- {
- scene.ForEachClient(delegate(IClientAPI client)
- {
- if (client is IStatsCollector)
- {
- report = report + client.FirstName +
- " " + client.LastName;
-
- IStatsCollector stats =
- (IStatsCollector) client;
-
- report = report + string.Format("{0,7} {1,7} {2,7} {3,7} {4,7} {5,7} {6,7} {7,7} {8,7} {9,7}\n",
- "Send",
- "In",
- "Out",
- "Resend",
- "Land",
- "Wind",
- "Cloud",
- "Task",
- "Texture",
- "Asset");
- report = report + stats.Report() +
- "\n";
- }
- });
- });
-
- return report;
+ StringBuilder report = new StringBuilder();
+
+ int columnPadding = 2;
+ int maxNameLength = 18;
+ int maxRegionNameLength = 14;
+ int maxTypeLength = 5;
+ int totalInfoFieldsLength = maxNameLength + columnPadding + maxRegionNameLength + columnPadding + maxTypeLength + columnPadding;
+
+ report.AppendFormat("{0,-" + maxNameLength + "}{1,-" + columnPadding + "}", "User", "");
+ report.AppendFormat("{0,-" + maxRegionNameLength + "}{1,-" + columnPadding + "}", "Region", "");
+ report.AppendFormat("{0,-" + maxTypeLength + "}{1,-" + columnPadding + "}", "Type", "");
+
+ report.AppendFormat(
+ "{0,9} {1,10} {2,8} {3,7} {4,7} {5,7} {6,7} {7,9} {8,7} {9,7}\n",
+ "Packets",
+ "Packets",
+ "Bytes",
+ "Bytes",
+ "Bytes",
+ "Bytes",
+ "Bytes",
+ "Bytes",
+ "Bytes",
+ "Bytes");
+
+ report.AppendFormat("{0,-" + totalInfoFieldsLength + "}", "");
+ report.AppendFormat(
+ "{0,9} {1,10} {2,8} {3,7} {4,7} {5,7} {6,7} {7,9} {8,7} {9,7}\n",
+ "Sent",
+ "Received",
+ "Resend",
+ "Land",
+ "Wind",
+ "Cloud",
+ "Task",
+ "Texture",
+ "Asset",
+ "State");
+
+ m_sceneManager.ForEachScene(
+ delegate(Scene scene)
+ {
+ scene.ForEachClient(
+ delegate(IClientAPI client)
+ {
+ if (client is IStatsCollector)
+ {
+ string name = client.Name;
+ string regionName = scene.RegionInfo.RegionName;
+
+ report.AppendFormat(
+ "{0,-" + maxNameLength + "}{1,-" + columnPadding + "}",
+ name.Length > maxNameLength ? name.Substring(0, maxNameLength) : name, "");
+ report.AppendFormat(
+ "{0,-" + maxRegionNameLength + "}{1,-" + columnPadding + "}",
+ regionName.Length > maxRegionNameLength ? regionName.Substring(0, maxRegionNameLength) : regionName, "");
+ report.AppendFormat(
+ "{0,-" + maxTypeLength + "}{1,-" + columnPadding + "}",
+ scene.PresenceChildStatus(client.AgentId) ? "Child" : "Root", "");
+
+ IStatsCollector stats = (IStatsCollector)client;
+
+ report.AppendLine(stats.Report());
+ }
+ });
+ });
+
+ return report.ToString();
}
///
--
cgit v1.1
From c4f3175e173b399f533fc42be36631d97b696a5a Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 17 Nov 2010 19:58:27 +0000
Subject: add "Unacked bytes" column to "show queues"
This should show the number of bytes sent to the client that it has not yet acknowledged.
---
OpenSim/Region/Application/OpenSim.cs | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
(limited to 'OpenSim/Region/Application')
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
m_console.Commands.AddCommand("region", false, "show queues",
"show queues",
- "Show queue data", HandleShow);
+ "Show queue data for each client",
+ HandleShow);
+
m_console.Commands.AddCommand("region", false, "show ratings",
"show ratings",
"Show rating data", HandleShow);
@@ -994,7 +996,7 @@ namespace OpenSim
int columnPadding = 2;
int maxNameLength = 18;
int maxRegionNameLength = 14;
- int maxTypeLength = 5;
+ int maxTypeLength = 4;
int totalInfoFieldsLength = maxNameLength + columnPadding + maxRegionNameLength + columnPadding + maxTypeLength + columnPadding;
report.AppendFormat("{0,-" + maxNameLength + "}{1,-" + columnPadding + "}", "User", "");
@@ -1002,7 +1004,7 @@ namespace OpenSim
report.AppendFormat("{0,-" + maxTypeLength + "}{1,-" + columnPadding + "}", "Type", "");
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",
"Bytes",
@@ -1012,13 +1014,15 @@ namespace OpenSim
"Bytes",
"Bytes",
"Bytes",
+ "Bytes",
"Bytes");
report.AppendFormat("{0,-" + totalInfoFieldsLength + "}", "");
report.AppendFormat(
- "{0,9} {1,10} {2,8} {3,7} {4,7} {5,7} {6,7} {7,9} {8,7} {9,7}\n",
- "Sent",
- "Received",
+ "{0,9} {1,9} {2,9} {3,8} {4,7} {5,7} {6,7} {7,7} {8,9} {9,7} {10,7}\n",
+ "Out",
+ "In",
+ "Unacked",
"Resend",
"Land",
"Wind",
@@ -1047,7 +1051,7 @@ namespace OpenSim
regionName.Length > maxRegionNameLength ? regionName.Substring(0, maxRegionNameLength) : regionName, "");
report.AppendFormat(
"{0,-" + maxTypeLength + "}{1,-" + columnPadding + "}",
- scene.PresenceChildStatus(client.AgentId) ? "Child" : "Root", "");
+ scene.PresenceChildStatus(client.AgentId) ? "Cd" : "Rt", "");
IStatsCollector stats = (IStatsCollector)client;
--
cgit v1.1
From af0deff7e9b052e4843bc8d4816ebd7aa80f48f4 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 17 Nov 2010 20:09:18 +0000
Subject: Make "show queues [full]" behave like "show users [full]"
Now, "show queues" only shows root agents. "show queues full" will show child agents as well
---
OpenSim/Region/Application/OpenSim.cs | 33 ++++++++++++++++++++++-----------
1 file changed, 22 insertions(+), 11 deletions(-)
(limited to 'OpenSim/Region/Application')
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs
index a90ce33..2c920f6 100644
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -286,16 +286,15 @@ namespace OpenSim
m_console.Commands.AddCommand("region", false, "show users",
"show users [full]",
- "Show user data", HandleShow);
+ "Show user data for users currently on the region",
+ "Without the 'full' option, only users actually on the region are shown."
+ + " With the 'full' option child agents of users in neighbouring regions are also shown.",
+ HandleShow);
m_console.Commands.AddCommand("region", false, "show connections",
"show connections",
"Show connection data", HandleShow);
- m_console.Commands.AddCommand("region", false, "show users full",
- "show users full",
- String.Empty, HandleShow);
-
m_console.Commands.AddCommand("region", false, "show modules",
"show modules",
"Show module data", HandleShow);
@@ -305,8 +304,10 @@ namespace OpenSim
"Show region data", HandleShow);
m_console.Commands.AddCommand("region", false, "show queues",
- "show queues",
+ "show queues [full]",
"Show queue data for each client",
+ "Without the 'full' option, only users actually on the region are shown."
+ + " With the 'full' option child agents of users in neighbouring regions are also shown.",
HandleShow);
m_console.Commands.AddCommand("region", false, "show ratings",
@@ -879,7 +880,7 @@ namespace OpenSim
{
agents = m_sceneManager.GetCurrentSceneAvatars();
}
-
+
MainConsole.Instance.Output(String.Format("\nAgents connected: {0}\n", agents.Count));
MainConsole.Instance.Output(
@@ -956,7 +957,7 @@ namespace OpenSim
break;
case "queues":
- Notice(GetQueuesReport());
+ Notice(GetQueuesReport(showParams));
break;
case "ratings":
@@ -986,11 +987,17 @@ namespace OpenSim
}
///
- /// print UDP Queue data for each client
+ /// Generate UDP Queue data report for each client
///
+ ///
///
- private string GetQueuesReport()
+ private string GetQueuesReport(string[] showParams)
{
+ bool showChildren = false;
+
+ if (showParams.Length > 1 && showParams[1] == "full")
+ showChildren = true;
+
StringBuilder report = new StringBuilder();
int columnPadding = 2;
@@ -1040,6 +1047,10 @@ namespace OpenSim
{
if (client is IStatsCollector)
{
+ bool isChild = scene.PresenceChildStatus(client.AgentId);
+ if (isChild && !showChildren)
+ return;
+
string name = client.Name;
string regionName = scene.RegionInfo.RegionName;
@@ -1051,7 +1062,7 @@ namespace OpenSim
regionName.Length > maxRegionNameLength ? regionName.Substring(0, maxRegionNameLength) : regionName, "");
report.AppendFormat(
"{0,-" + maxTypeLength + "}{1,-" + columnPadding + "}",
- scene.PresenceChildStatus(client.AgentId) ? "Cd" : "Rt", "");
+ isChild ? "Cd" : "Rt", "");
IStatsCollector stats = (IStatsCollector)client;
--
cgit v1.1
From 2c7be7130ea3ebca59b4d6d071267adcae55cb96 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 20 Nov 2010 02:32:12 +0000
Subject: Bump oar version to 1.0 from 0.5
If oar contents are being changed such that older versions of opensim can't load them, then the major version must be increased
This also locks version parameters to either 1.0 or 0.4, so that arbitrary 'versions' cannot be saved
Also closes save stream properly in the event of an error
Version 1.0 OARs are currently incompatible with OpenSim 0.7.0.2 and earlier. However, you can still save compatible version 0.4 OARs by specifing --version=0 on the save oar command line
e.g. save oar --version=0 oars/test.oar
---
OpenSim/Region/Application/OpenSim.cs | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'OpenSim/Region/Application')
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs
index 2c920f6..dd2e859 100644
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -265,9 +265,9 @@ namespace OpenSim
LoadOar);
m_console.Commands.AddCommand("region", false, "save oar",
- "save oar [-v|version=N] []",
+ "save oar [-v|--version=N] []",
"Save a region's data to an OAR archive.",
- "-v|version=N generates scene objects as per older versions of the serialization (e.g. -v=0)" + Environment.NewLine
+ "-v|--version=N generates scene objects as per older versions of the serialization (e.g. -v=0)" + Environment.NewLine
+ "The OAR path must be a filesystem path."
+ " If this is not given then the oar is saved to region.oar in the current directory.",
SaveOar);
--
cgit v1.1
From 6a9ae9e7cb71d79e9ec06cf25009e8bf45850dd1 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sun, 21 Nov 2010 13:16:52 -0800
Subject: Global creator information working on MySQL DB and on load/save OARs.
Creator name properly shown on the viewer as first.last @authority. New
option added to save oar -profile=url. Migration on RegionStore making
CreatorID be 255 chars. Moved Handling of user UUID -> name requests to a new
module UserManagement/UserManagementModule.
---
OpenSim/Region/Application/OpenSim.cs | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
(limited to 'OpenSim/Region/Application')
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs
index dd2e859..6127c2d 100644
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -265,9 +265,10 @@ namespace OpenSim
LoadOar);
m_console.Commands.AddCommand("region", false, "save oar",
- "save oar [-v|--version=N] []",
+ "save oar [-v|--version=N] [-p|--profile=url] []",
"Save a region's data to an OAR archive.",
"-v|--version=N generates scene objects as per older versions of the serialization (e.g. -v=0)" + Environment.NewLine
+ + "-p|--profile=url adds the url of the profile service to the saved user information" + Environment.NewLine
+ "The OAR path must be a filesystem path."
+ " If this is not given then the oar is saved to region.oar in the current directory.",
SaveOar);
--
cgit v1.1