From caceca87e45a2ae0f7f93bb94c8c16d0ae0cb98d Mon Sep 17 00:00:00 2001
From: Robert Adams <Robert.Adams@intel.com>
Date: Sat, 23 Feb 2013 17:04:19 -0800
Subject: [PATCH] Modify StatsManager so console command "show stats category
 container" only outputs the statistics in the specified container in the
 category.

---
 OpenSim/Framework/Monitoring/StatsManager.cs | 29 ++++++++++++++++----
 1 file changed, 24 insertions(+), 5 deletions(-)

diff --git a/OpenSim/Framework/Monitoring/StatsManager.cs b/OpenSim/Framework/Monitoring/StatsManager.cs
index 910907eb31..24db6d44c0 100644
--- a/OpenSim/Framework/Monitoring/StatsManager.cs
+++ b/OpenSim/Framework/Monitoring/StatsManager.cs
@@ -85,6 +85,7 @@ namespace OpenSim.Framework.Monitoring
             if (cmd.Length > 2)
             {
                 var categoryName = cmd[2];
+                var containerName = cmd.Length > 3 ? cmd[3] : String.Empty;
 
                 if (categoryName == AllSubCommand)
                 {
@@ -108,7 +109,20 @@ namespace OpenSim.Framework.Monitoring
                     }
                     else
                     {
-                        OutputCategoryStatsToConsole(con, category);
+                        if (String.IsNullOrEmpty(containerName))
+                            OutputCategoryStatsToConsole(con, category);
+                        else
+                        {
+                            SortedDictionary<string, Stat> container;
+                            if (category.TryGetValue(containerName, out container))
+                            {
+                                OutputContainerStatsToConsole(con, container);
+                            }
+                            else
+                            {
+                                con.OutputFormat("No such container {0} in category {1}", containerName, categoryName);
+                            }
+                        }
                     }
                 }
             }
@@ -124,10 +138,15 @@ namespace OpenSim.Framework.Monitoring
         {
             foreach (var container in category.Values)
             {
-                foreach (Stat stat in container.Values)
-                {
-                    con.Output(stat.ToConsoleString());
-                }
+                OutputContainerStatsToConsole(con, container);
+            }
+        }
+
+        private static void OutputContainerStatsToConsole( ICommandConsole con, SortedDictionary<string, Stat> container)
+        {
+            foreach (Stat stat in container.Values)
+            {
+                con.Output(stat.ToConsoleString());
             }
         }