From 90528c23d991cd1fc77823be49e4135cf412b92e Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 23 Jul 2013 01:13:13 +0100
Subject: For stats which can show average change over time, show the last
 sample as well as the average.

This is somewhat cryptic at the moment, need to improve documentation.
---
 OpenSim/Framework/Monitoring/Stats/Stat.cs | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'OpenSim/Framework/Monitoring')

diff --git a/OpenSim/Framework/Monitoring/Stats/Stat.cs b/OpenSim/Framework/Monitoring/Stats/Stat.cs
index 9629b6e..cc2c947 100644
--- a/OpenSim/Framework/Monitoring/Stats/Stat.cs
+++ b/OpenSim/Framework/Monitoring/Stats/Stat.cs
@@ -253,6 +253,8 @@ namespace OpenSim.Framework.Monitoring
                 == MeasuresOfInterest.AverageChangeOverTime)
             {
                 double totalChange = 0;
+                double lastChangeOverTime = 0;
+                double? penultimateSample = null;
                 double? lastSample = null;
 
                 lock (m_samples)
@@ -266,13 +268,21 @@ namespace OpenSim.Framework.Monitoring
                         if (lastSample != null)
                             totalChange += s - (double)lastSample;
 
+                        penultimateSample = lastSample;
                         lastSample = s;
                     }
                 }
 
+                if (lastSample != null && penultimateSample != null)
+                    lastChangeOverTime = (double)lastSample - (double)penultimateSample;
+
                 int divisor = m_samples.Count <= 1 ? 1 : m_samples.Count - 1;
 
-                sb.AppendFormat(", {0:0.##} {1}/s", totalChange / divisor / (Watchdog.WATCHDOG_INTERVAL_MS / 1000), UnitName);
+                double averageChangeOverTime = totalChange / divisor / (Watchdog.WATCHDOG_INTERVAL_MS / 1000);
+
+                sb.AppendFormat(
+                    ", {0:0.##} {1}/s, {2:0.##} {3}/s", 
+                    lastChangeOverTime, UnitName, averageChangeOverTime, UnitName);
             }
         }
     }
-- 
cgit v1.1


From 76e46d0158461a29e6ef358ba8cb7b7323cc0c05 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 23 Jul 2013 17:23:16 +0100
Subject: Improve spacing between data and units on console stats display

---
 OpenSim/Framework/Monitoring/Stats/Stat.cs | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

(limited to 'OpenSim/Framework/Monitoring')

diff --git a/OpenSim/Framework/Monitoring/Stats/Stat.cs b/OpenSim/Framework/Monitoring/Stats/Stat.cs
index cc2c947..f2329ce 100644
--- a/OpenSim/Framework/Monitoring/Stats/Stat.cs
+++ b/OpenSim/Framework/Monitoring/Stats/Stat.cs
@@ -225,7 +225,13 @@ namespace OpenSim.Framework.Monitoring
         public virtual string ToConsoleString()
         {
             StringBuilder sb = new StringBuilder();
-            sb.AppendFormat("{0}.{1}.{2} : {3} {4}", Category, Container, ShortName, Value, UnitName);
+            sb.AppendFormat(
+                "{0}.{1}.{2} : {3}{4}", 
+                Category, 
+                Container, 
+                ShortName, 
+                Value, 
+                UnitName == null || UnitName == "" ? "" : string.Format(" {0}", UnitName));
 
             AppendMeasuresOfInterest(sb);
 
@@ -281,8 +287,11 @@ namespace OpenSim.Framework.Monitoring
                 double averageChangeOverTime = totalChange / divisor / (Watchdog.WATCHDOG_INTERVAL_MS / 1000);
 
                 sb.AppendFormat(
-                    ", {0:0.##} {1}/s, {2:0.##} {3}/s", 
-                    lastChangeOverTime, UnitName, averageChangeOverTime, UnitName);
+                    ", {0:0.##}{1}/s, {2:0.##}{3}/s", 
+                    lastChangeOverTime, 
+                    UnitName == null || UnitName == "" ? "" : string.Format(" {0}", UnitName), 
+                    averageChangeOverTime,
+                    UnitName == null || UnitName == "" ? "" : string.Format(" {0}", UnitName));
             }
         }
     }
-- 
cgit v1.1


From 9a4a513b5e4e2496b32113dcffbeeae776eabb89 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 23 Jul 2013 23:31:35 +0100
Subject: Correct issue where the last instance of a sampled stat was shown 3x
 larger than it should have been (though internal use was correct)

---
 OpenSim/Framework/Monitoring/Stats/Stat.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'OpenSim/Framework/Monitoring')

diff --git a/OpenSim/Framework/Monitoring/Stats/Stat.cs b/OpenSim/Framework/Monitoring/Stats/Stat.cs
index f2329ce..ffd5132 100644
--- a/OpenSim/Framework/Monitoring/Stats/Stat.cs
+++ b/OpenSim/Framework/Monitoring/Stats/Stat.cs
@@ -280,7 +280,8 @@ namespace OpenSim.Framework.Monitoring
                 }
 
                 if (lastSample != null && penultimateSample != null)
-                    lastChangeOverTime = (double)lastSample - (double)penultimateSample;
+                    lastChangeOverTime 
+                        = ((double)lastSample - (double)penultimateSample) / (Watchdog.WATCHDOG_INTERVAL_MS / 1000);
 
                 int divisor = m_samples.Count <= 1 ? 1 : m_samples.Count - 1;
 
-- 
cgit v1.1