4 files changed, 235 insertions, 150 deletions
diff --git a/OpenSim/Framework/Monitoring/Stats/CounterStat.cs b/OpenSim/Framework/Monitoring/Stats/CounterStat.cs
index 04442c3..318cf1c 100755
--- a/OpenSim/Framework/Monitoring/Stats/CounterStat.cs
+++ b/OpenSim/Framework/Monitoring/Stats/CounterStat.cs
@@ -34,142 +34,6 @@ using OpenMetaverse.StructuredData;
 namespace OpenSim.Framework.Monitoring
 {
-// Create a time histogram of events. The histogram is built in a wrap-around
-//   array of equally distributed buckets.
-// For instance, a minute long histogram of second sized buckets would be:
-//          new EventHistogram(60, 1000)
-public class EventHistogram
-{
-    private int m_timeBase;
-    private int m_numBuckets;
-    private int m_bucketMilliseconds;
-    private int m_lastBucket;
-    private int m_totalHistogramMilliseconds;
-    private long[] m_histogram;
-    private object histoLock = new object();
-    public EventHistogram(int numberOfBuckets, int millisecondsPerBucket)
-    {
-        m_numBuckets = numberOfBuckets;
-        m_bucketMilliseconds = millisecondsPerBucket;
-        m_totalHistogramMilliseconds = m_numBuckets * m_bucketMilliseconds;
-        m_histogram = new long[m_numBuckets];
-        Zero();
-        m_lastBucket = 0;
-        m_timeBase = Util.EnvironmentTickCount();
-    }
-    public void Event()
-    {
-        this.Event(1);
-    }
-    // Record an event at time 'now' in the histogram.
-    public void Event(int cnt)
-    {
-        lock (histoLock)
-        {
-            // The time as displaced from the base of the histogram
-            int bucketTime = Util.EnvironmentTickCountSubtract(m_timeBase);
-            // If more than the total time of the histogram, we just start over
-            if (bucketTime > m_totalHistogramMilliseconds)
-            {
-                Zero();
-                m_lastBucket = 0;
-                m_timeBase = Util.EnvironmentTickCount();
-            }
-            else
-            {
-                // To which bucket should we add this event?
-                int bucket = bucketTime / m_bucketMilliseconds;
-                // Advance m_lastBucket to the new bucket. Zero any buckets skipped over.
-                while (bucket != m_lastBucket)
-                {
-                    // Zero from just after the last bucket to the new bucket or the end
-                    for (int jj = m_lastBucket + 1; jj <= Math.Min(bucket, m_numBuckets - 1); jj++)
-                    {
-                        m_histogram[jj] = 0;
-                    }
-                    m_lastBucket = bucket;
-                    // If the new bucket is off the end, wrap around to the beginning
-                    if (bucket > m_numBuckets)
-                    {
-                        bucket -= m_numBuckets;
-                        m_lastBucket = 0;
-                        m_histogram[m_lastBucket] = 0;
-                        m_timeBase += m_totalHistogramMilliseconds;
-                    }
-                }
-            }
-            m_histogram[m_lastBucket] += cnt;
-        }
-    }
-    // Get a copy of the current histogram
-    public long[] GetHistogram()
-    {
-        long[] ret = new long[m_numBuckets];
-        lock (histoLock)
-        {
-            int indx = m_lastBucket + 1;
-            for (int ii = 0; ii < m_numBuckets; ii++, indx++)
-            {
-                if (indx >= m_numBuckets)
-                    indx = 0;
-                ret[ii] = m_histogram[indx];
-            }
-        }
-        return ret;
-    }
-    public OSDMap GetHistogramAsOSDMap()
-    {
-        OSDMap ret = new OSDMap();
-        ret.Add("Buckets", OSD.FromInteger(m_numBuckets));
-        ret.Add("BucketMilliseconds", OSD.FromInteger(m_bucketMilliseconds));
-        ret.Add("TotalMilliseconds", OSD.FromInteger(m_totalHistogramMilliseconds));
-        // Compute a number for the first bucket in the histogram.
-        // This will allow readers to know how this histogram relates to any previously read histogram.
-        int baseBucketNum = (m_timeBase / m_bucketMilliseconds) + m_lastBucket + 1;
-        ret.Add("BaseNumber", OSD.FromInteger(baseBucketNum));
-        ret.Add("Values", GetHistogramAsOSDArray());
-        return ret;
-    }
-    // Get a copy of the current histogram
-    public OSDArray GetHistogramAsOSDArray()
-    {
-        OSDArray ret = new OSDArray(m_numBuckets);
-        lock (histoLock)
-        {
-            int indx = m_lastBucket + 1;
-            for (int ii = 0; ii < m_numBuckets; ii++, indx++)
-            {
-                if (indx >= m_numBuckets)
-                    indx = 0;
-                ret[ii] = OSD.FromLong(m_histogram[indx]);
-            }
-        }
-        return ret;
-    }
-    // Zero out the histogram
-    public void Zero()
-    {
-        lock (histoLock)
-        {
-            for (int ii = 0; ii < m_numBuckets; ii++)
-                m_histogram[ii] = 0;
-        }
-    }
-}
 // A statistic that wraps a counter.
 // Built this way mostly so histograms and history can be created.
 public class CounterStat : Stat
@@ -236,12 +100,18 @@ public class CounterStat : Stat
        // If there are any histograms, add a new field that is an array of histograms as OSDMaps
        if (m_histograms.Count > 0)
        {
-            OSDArray histos = new OSDArray();
+            lock (counterLock)
-            foreach (EventHistogram histo in m_histograms.Values)
            {
-                histos.Add(histo.GetHistogramAsOSDMap());
+                if (m_histograms.Count > 0)
+                {
+                    OSDArray histos = new OSDArray();
+                    foreach (EventHistogram histo in m_histograms.Values)
+                    {
+                        histos.Add(histo.GetHistogramAsOSDMap());
+                    }
+                    map.Add("Histograms", histos);
+                }
            }
-            map.Add("Histograms", histos);
        }
        return map;
    }
diff --git a/OpenSim/Framework/Monitoring/Stats/EventHistogram.cs b/OpenSim/Framework/Monitoring/Stats/EventHistogram.cs
new file mode 100755
index 0000000..f51f322
--- /dev/null
+++ b/OpenSim/Framework/Monitoring/Stats/EventHistogram.cs
@@ -0,0 +1,173 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using OpenMetaverse.StructuredData;
+namespace OpenSim.Framework.Monitoring
+{
+// Create a time histogram of events. The histogram is built in a wrap-around
+//   array of equally distributed buckets.
+// For instance, a minute long histogram of second sized buckets would be:
+//          new EventHistogram(60, 1000)
+public class EventHistogram
+{
+    private int m_timeBase;
+    private int m_numBuckets;
+    private int m_bucketMilliseconds;
+    private int m_lastBucket;
+    private int m_totalHistogramMilliseconds;
+    private long[] m_histogram;
+    private object histoLock = new object();
+    public EventHistogram(int numberOfBuckets, int millisecondsPerBucket)
+    {
+        m_numBuckets = numberOfBuckets;
+        m_bucketMilliseconds = millisecondsPerBucket;
+        m_totalHistogramMilliseconds = m_numBuckets * m_bucketMilliseconds;
+        m_histogram = new long[m_numBuckets];
+        Zero();
+        m_lastBucket = 0;
+        m_timeBase = Util.EnvironmentTickCount();
+    }
+    public void Event()
+    {
+        this.Event(1);
+    }
+    // Record an event at time 'now' in the histogram.
+    public void Event(int cnt)
+    {
+        lock (histoLock)
+        {
+            // The time as displaced from the base of the histogram
+            int bucketTime = Util.EnvironmentTickCountSubtract(m_timeBase);
+            // If more than the total time of the histogram, we just start over
+            if (bucketTime > m_totalHistogramMilliseconds)
+            {
+                Zero();
+                m_lastBucket = 0;
+                m_timeBase = Util.EnvironmentTickCount();
+            }
+            else
+            {
+                // To which bucket should we add this event?
+                int bucket = bucketTime / m_bucketMilliseconds;
+                // Advance m_lastBucket to the new bucket. Zero any buckets skipped over.
+                while (bucket != m_lastBucket)
+                {
+                    // Zero from just after the last bucket to the new bucket or the end
+                    for (int jj = m_lastBucket + 1; jj <= Math.Min(bucket, m_numBuckets - 1); jj++)
+                    {
+                        m_histogram[jj] = 0;
+                    }
+                    m_lastBucket = bucket;
+                    // If the new bucket is off the end, wrap around to the beginning
+                    if (bucket > m_numBuckets)
+                    {
+                        bucket -= m_numBuckets;
+                        m_lastBucket = 0;
+                        m_histogram[m_lastBucket] = 0;
+                        m_timeBase += m_totalHistogramMilliseconds;
+                    }
+                }
+            }
+            m_histogram[m_lastBucket] += cnt;
+        }
+    }
+    // Get a copy of the current histogram
+    public long[] GetHistogram()
+    {
+        long[] ret = new long[m_numBuckets];
+        lock (histoLock)
+        {
+            int indx = m_lastBucket + 1;
+            for (int ii = 0; ii < m_numBuckets; ii++, indx++)
+            {
+                if (indx >= m_numBuckets)
+                    indx = 0;
+                ret[ii] = m_histogram[indx];
+            }
+        }
+        return ret;
+    }
+    public OSDMap GetHistogramAsOSDMap()
+    {
+        OSDMap ret = new OSDMap();
+        ret.Add("Buckets", OSD.FromInteger(m_numBuckets));
+        ret.Add("BucketMilliseconds", OSD.FromInteger(m_bucketMilliseconds));
+        ret.Add("TotalMilliseconds", OSD.FromInteger(m_totalHistogramMilliseconds));
+        // Compute a number for the first bucket in the histogram.
+        // This will allow readers to know how this histogram relates to any previously read histogram.
+        int baseBucketNum = (m_timeBase / m_bucketMilliseconds) + m_lastBucket + 1;
+        ret.Add("BaseNumber", OSD.FromInteger(baseBucketNum));
+        ret.Add("Values", GetHistogramAsOSDArray());
+        return ret;
+    }
+    // Get a copy of the current histogram
+    public OSDArray GetHistogramAsOSDArray()
+    {
+        OSDArray ret = new OSDArray(m_numBuckets);
+        lock (histoLock)
+        {
+            int indx = m_lastBucket + 1;
+            for (int ii = 0; ii < m_numBuckets; ii++, indx++)
+            {
+                if (indx >= m_numBuckets)
+                    indx = 0;
+                ret[ii] = OSD.FromLong(m_histogram[indx]);
+            }
+        }
+        return ret;
+    }
+    // Zero out the histogram
+    public void Zero()
+    {
+        lock (histoLock)
+        {
+            for (int ii = 0; ii < m_numBuckets; ii++)
+                m_histogram[ii] = 0;
+        }
+    }
+}
+}
diff --git a/OpenSim/Framework/Monitoring/Stats/PercentageStat.cs b/OpenSim/Framework/Monitoring/Stats/PercentageStat.cs
index 60bed55..55ddf06 100644
--- a/OpenSim/Framework/Monitoring/Stats/PercentageStat.cs
+++ b/OpenSim/Framework/Monitoring/Stats/PercentageStat.cs
@@ -29,6 +29,8 @@ using System;
 using System.Collections.Generic;
 using System.Text;
+using OpenMetaverse.StructuredData;
 namespace OpenSim.Framework.Monitoring
 {
    public class PercentageStat : Stat
@@ -84,5 +86,19 @@ namespace OpenSim.Framework.Monitoring
            return sb.ToString();
        }
+        // PercentageStat is a basic stat plus percent calc
+        public override OSDMap ToOSDMap()
+        {
+            // Get the foundational instance
+            OSDMap map = base.ToOSDMap();
+            map["StatType"] = "PercentageStat";
+            map.Add("Antecedent", OSD.FromLong(Antecedent));
+            map.Add("Consequent", OSD.FromLong(Consequent));
+            return map;
+        }
    }
 }
 \ No newline at end of file
diff --git a/OpenSim/Framework/Monitoring/Stats/Stat.cs b/OpenSim/Framework/Monitoring/Stats/Stat.cs
index ffd5132..2b34493 100644
--- a/OpenSim/Framework/Monitoring/Stats/Stat.cs
+++ b/OpenSim/Framework/Monitoring/Stats/Stat.cs
@@ -241,6 +241,8 @@ namespace OpenSim.Framework.Monitoring
        public virtual OSDMap ToOSDMap()
        {
            OSDMap ret = new OSDMap();
+            ret.Add("StatType", "Stat");    // used by overloading classes to denote type of stat
            ret.Add("Category", OSD.FromString(Category));
            ret.Add("Container", OSD.FromString(Container));
            ret.Add("ShortName", OSD.FromString(ShortName));
@@ -248,26 +250,36 @@ namespace OpenSim.Framework.Monitoring
            ret.Add("Description", OSD.FromString(Description));
            ret.Add("UnitName", OSD.FromString(UnitName));
            ret.Add("Value", OSD.FromReal(Value));
-            ret.Add("StatType", "Stat");    // used by overloading classes to denote type of stat
+            double lastChangeOverTime, averageChangeOverTime;
+            if (ComputeMeasuresOfInterest(out lastChangeOverTime, out averageChangeOverTime))
+            {
+                ret.Add("LastChangeOverTime", OSD.FromReal(lastChangeOverTime));
+                ret.Add("AverageChangeOverTime", OSD.FromReal(averageChangeOverTime));
+            }
            return ret;
        }
-        protected void AppendMeasuresOfInterest(StringBuilder sb)
+        // Compute the averages over time and return same.
+        // Return 'true' if averages were actually computed. 'false' if no average info.
+        public bool ComputeMeasuresOfInterest(out double lastChangeOverTime, out double averageChangeOverTime)
        {
-            if ((MeasuresOfInterest & MeasuresOfInterest.AverageChangeOverTime) 
+            bool ret = false;
-                == MeasuresOfInterest.AverageChangeOverTime)
+            lastChangeOverTime = 0;
+            averageChangeOverTime = 0;
+            if ((MeasuresOfInterest & MeasuresOfInterest.AverageChangeOverTime) == MeasuresOfInterest.AverageChangeOverTime)
            {
                double totalChange = 0;
-                double lastChangeOverTime = 0;
                double? penultimateSample = null;
                double? lastSample = null;
                lock (m_samples)
                {
-//                    m_log.DebugFormat(
+                    //                    m_log.DebugFormat(
-//                        "[STAT]: Samples for {0} are {1}", 
+                    //                        "[STAT]: Samples for {0} are {1}", 
-//                        Name, string.Join(",", m_samples.Select(s => s.ToString()).ToArray()));
+                    //                        Name, string.Join(",", m_samples.Select(s => s.ToString()).ToArray()));
                    foreach (double s in m_samples)
                    {
@@ -280,13 +292,27 @@ namespace OpenSim.Framework.Monitoring
                }
                if (lastSample != null && penultimateSample != null)
-                    lastChangeOverTime 
+                {
+                    lastChangeOverTime
                        = ((double)lastSample - (double)penultimateSample) / (Watchdog.WATCHDOG_INTERVAL_MS / 1000);
+                }
                int divisor = m_samples.Count <= 1 ? 1 : m_samples.Count - 1;
-                double averageChangeOverTime = totalChange / divisor / (Watchdog.WATCHDOG_INTERVAL_MS / 1000);
+                averageChangeOverTime = totalChange / divisor / (Watchdog.WATCHDOG_INTERVAL_MS / 1000);
+                ret = true;
+            }
+            return ret;
+        }
+        protected void AppendMeasuresOfInterest(StringBuilder sb)
+        {
+            double lastChangeOverTime = 0;
+            double averageChangeOverTime = 0;
+            if (ComputeMeasuresOfInterest(out lastChangeOverTime, out averageChangeOverTime))
+            {
                sb.AppendFormat(
                    ", {0:0.##}{1}/s, {2:0.##}{3}/s", 
                    lastChangeOverTime,

diff --git a/OpenSim/Framework/Monitoring/Stats/CounterStat.cs b/OpenSim/Framework/Monitoring/Stats/CounterStat.cs index 04442c3..318cf1c 100755 --- a/OpenSim/Framework/Monitoring/Stats/CounterStat.cs +++ b/OpenSim/Framework/Monitoring/Stats/CounterStat.cs
@@ -34,142 +34,6 @@ using OpenMetaverse.StructuredData;
34		34
35	namespace OpenSim.Framework.Monitoring	35	namespace OpenSim.Framework.Monitoring
36	{	36	{
37	// Create a time histogram of events. The histogram is built in a wrap-around
38	// array of equally distributed buckets.
39	// For instance, a minute long histogram of second sized buckets would be:
40	// new EventHistogram(60, 1000)
41	public class EventHistogram
42	{
43	private int m_timeBase;
44	private int m_numBuckets;
45	private int m_bucketMilliseconds;
46	private int m_lastBucket;
47	private int m_totalHistogramMilliseconds;
48	private long[] m_histogram;
49	private object histoLock = new object();
50
51	public EventHistogram(int numberOfBuckets, int millisecondsPerBucket)
52	{
53	m_numBuckets = numberOfBuckets;
54	m_bucketMilliseconds = millisecondsPerBucket;
55	m_totalHistogramMilliseconds = m_numBuckets * m_bucketMilliseconds;
56
57	m_histogram = new long[m_numBuckets];
58	Zero();
59	m_lastBucket = 0;
60	m_timeBase = Util.EnvironmentTickCount();
61	}
62
63	public void Event()
64	{
65	this.Event(1);
66	}
67
68	// Record an event at time 'now' in the histogram.
69	public void Event(int cnt)
70	{
71	lock (histoLock)
72	{
73	// The time as displaced from the base of the histogram
74	int bucketTime = Util.EnvironmentTickCountSubtract(m_timeBase);
75
76	// If more than the total time of the histogram, we just start over
77	if (bucketTime > m_totalHistogramMilliseconds)
78	{
79	Zero();
80	m_lastBucket = 0;
81	m_timeBase = Util.EnvironmentTickCount();
82	}
83	else
84	{
85	// To which bucket should we add this event?
86	int bucket = bucketTime / m_bucketMilliseconds;
87
88	// Advance m_lastBucket to the new bucket. Zero any buckets skipped over.
89	while (bucket != m_lastBucket)
90	{
91	// Zero from just after the last bucket to the new bucket or the end
92	for (int jj = m_lastBucket + 1; jj <= Math.Min(bucket, m_numBuckets - 1); jj++)
93	{
94	m_histogram[jj] = 0;
95	}
96	m_lastBucket = bucket;
97	// If the new bucket is off the end, wrap around to the beginning
98	if (bucket > m_numBuckets)
99	{
100	bucket -= m_numBuckets;
101	m_lastBucket = 0;
102	m_histogram[m_lastBucket] = 0;
103	m_timeBase += m_totalHistogramMilliseconds;
104	}
105	}
106	}
107	m_histogram[m_lastBucket] += cnt;
108	}
109	}
110
111	// Get a copy of the current histogram
112	public long[] GetHistogram()
113	{
114	long[] ret = new long[m_numBuckets];
115	lock (histoLock)
116	{
117	int indx = m_lastBucket + 1;
118	for (int ii = 0; ii < m_numBuckets; ii++, indx++)
119	{
120	if (indx >= m_numBuckets)
121	indx = 0;
122	ret[ii] = m_histogram[indx];
123	}
124	}
125	return ret;
126	}
127
128	public OSDMap GetHistogramAsOSDMap()
129	{
130	OSDMap ret = new OSDMap();
131
132	ret.Add("Buckets", OSD.FromInteger(m_numBuckets));
133	ret.Add("BucketMilliseconds", OSD.FromInteger(m_bucketMilliseconds));
134	ret.Add("TotalMilliseconds", OSD.FromInteger(m_totalHistogramMilliseconds));
135
136	// Compute a number for the first bucket in the histogram.
137	// This will allow readers to know how this histogram relates to any previously read histogram.
138	int baseBucketNum = (m_timeBase / m_bucketMilliseconds) + m_lastBucket + 1;
139	ret.Add("BaseNumber", OSD.FromInteger(baseBucketNum));
140
141	ret.Add("Values", GetHistogramAsOSDArray());
142
143	return ret;
144	}
145	// Get a copy of the current histogram
146	public OSDArray GetHistogramAsOSDArray()
147	{
148	OSDArray ret = new OSDArray(m_numBuckets);
149	lock (histoLock)
150	{
151	int indx = m_lastBucket + 1;
152	for (int ii = 0; ii < m_numBuckets; ii++, indx++)
153	{
154	if (indx >= m_numBuckets)
155	indx = 0;
156	ret[ii] = OSD.FromLong(m_histogram[indx]);
157	}
158	}
159	return ret;
160	}
161
162	// Zero out the histogram
163	public void Zero()
164	{
165	lock (histoLock)
166	{
167	for (int ii = 0; ii < m_numBuckets; ii++)
168	m_histogram[ii] = 0;
169	}
170	}
171	}
172
173	// A statistic that wraps a counter.	37	// A statistic that wraps a counter.
174	// Built this way mostly so histograms and history can be created.	38	// Built this way mostly so histograms and history can be created.
175	public class CounterStat : Stat	39	public class CounterStat : Stat
@@ -236,12 +100,18 @@ public class CounterStat : Stat
236	// If there are any histograms, add a new field that is an array of histograms as OSDMaps	100	// If there are any histograms, add a new field that is an array of histograms as OSDMaps
237	if (m_histograms.Count > 0)	101	if (m_histograms.Count > 0)
238	{	102	{
239	OSDArray histos = new OSDArray();	103	lock (counterLock)
240	foreach (EventHistogram histo in m_histograms.Values)
241	{	104	{
242	histos.Add(histo.GetHistogramAsOSDMap());	105	if (m_histograms.Count > 0)
		106	{
		107	OSDArray histos = new OSDArray();
		108	foreach (EventHistogram histo in m_histograms.Values)
		109	{
		110	histos.Add(histo.GetHistogramAsOSDMap());
		111	}
		112	map.Add("Histograms", histos);
		113	}
243	}	114	}
244	map.Add("Histograms", histos);
245	}	115	}
246	return map;	116	return map;
247	}	117	}


diff --git a/OpenSim/Framework/Monitoring/Stats/EventHistogram.cs b/OpenSim/Framework/Monitoring/Stats/EventHistogram.cs new file mode 100755 index 0000000..f51f322 --- /dev/null +++ b/OpenSim/Framework/Monitoring/Stats/EventHistogram.cs
@@ -0,0 +1,173 @@
		1	/*
		2	* Copyright (c) Contributors, http://opensimulator.org/
		3	* See CONTRIBUTORS.TXT for a full list of copyright holders.
		4	*
		5	* Redistribution and use in source and binary forms, with or without
		6	* modification, are permitted provided that the following conditions are met:
		7	* * Redistributions of source code must retain the above copyright
		8	* notice, this list of conditions and the following disclaimer.
		9	* * Redistributions in binary form must reproduce the above copyright
		10	* notice, this list of conditions and the following disclaimer in the
		11	* documentation and/or other materials provided with the distribution.
		12	* * Neither the name of the OpenSimulator Project nor the
		13	* names of its contributors may be used to endorse or promote products
		14	* derived from this software without specific prior written permission.
		15	*
		16	* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
		17	* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
		18	* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
		19	* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
		20	* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
		21	* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
		22	* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
		23	* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
		24	* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
		25	* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
		26	*/
		27
		28	using System;
		29	using System.Collections.Generic;
		30	using System.Linq;
		31	using System.Text;
		32
		33	using OpenMetaverse.StructuredData;
		34
		35	namespace OpenSim.Framework.Monitoring
		36	{
		37	// Create a time histogram of events. The histogram is built in a wrap-around
		38	// array of equally distributed buckets.
		39	// For instance, a minute long histogram of second sized buckets would be:
		40	// new EventHistogram(60, 1000)
		41	public class EventHistogram
		42	{
		43	private int m_timeBase;
		44	private int m_numBuckets;
		45	private int m_bucketMilliseconds;
		46	private int m_lastBucket;
		47	private int m_totalHistogramMilliseconds;
		48	private long[] m_histogram;
		49	private object histoLock = new object();
		50
		51	public EventHistogram(int numberOfBuckets, int millisecondsPerBucket)
		52	{
		53	m_numBuckets = numberOfBuckets;
		54	m_bucketMilliseconds = millisecondsPerBucket;
		55	m_totalHistogramMilliseconds = m_numBuckets * m_bucketMilliseconds;
		56
		57	m_histogram = new long[m_numBuckets];
		58	Zero();
		59	m_lastBucket = 0;
		60	m_timeBase = Util.EnvironmentTickCount();
		61	}
		62
		63	public void Event()
		64	{
		65	this.Event(1);
		66	}
		67
		68	// Record an event at time 'now' in the histogram.
		69	public void Event(int cnt)
		70	{
		71	lock (histoLock)
		72	{
		73	// The time as displaced from the base of the histogram
		74	int bucketTime = Util.EnvironmentTickCountSubtract(m_timeBase);
		75
		76	// If more than the total time of the histogram, we just start over
		77	if (bucketTime > m_totalHistogramMilliseconds)
		78	{
		79	Zero();
		80	m_lastBucket = 0;
		81	m_timeBase = Util.EnvironmentTickCount();
		82	}
		83	else
		84	{
		85	// To which bucket should we add this event?
		86	int bucket = bucketTime / m_bucketMilliseconds;
		87
		88	// Advance m_lastBucket to the new bucket. Zero any buckets skipped over.
		89	while (bucket != m_lastBucket)
		90	{
		91	// Zero from just after the last bucket to the new bucket or the end
		92	for (int jj = m_lastBucket + 1; jj <= Math.Min(bucket, m_numBuckets - 1); jj++)
		93	{
		94	m_histogram[jj] = 0;
		95	}
		96	m_lastBucket = bucket;
		97	// If the new bucket is off the end, wrap around to the beginning
		98	if (bucket > m_numBuckets)
		99	{
		100	bucket -= m_numBuckets;
		101	m_lastBucket = 0;
		102	m_histogram[m_lastBucket] = 0;
		103	m_timeBase += m_totalHistogramMilliseconds;
		104	}
		105	}
		106	}
		107	m_histogram[m_lastBucket] += cnt;
		108	}
		109	}
		110
		111	// Get a copy of the current histogram
		112	public long[] GetHistogram()
		113	{
		114	long[] ret = new long[m_numBuckets];
		115	lock (histoLock)
		116	{
		117	int indx = m_lastBucket + 1;
		118	for (int ii = 0; ii < m_numBuckets; ii++, indx++)
		119	{
		120	if (indx >= m_numBuckets)
		121	indx = 0;
		122	ret[ii] = m_histogram[indx];
		123	}
		124	}
		125	return ret;
		126	}
		127
		128	public OSDMap GetHistogramAsOSDMap()
		129	{
		130	OSDMap ret = new OSDMap();
		131
		132	ret.Add("Buckets", OSD.FromInteger(m_numBuckets));
		133	ret.Add("BucketMilliseconds", OSD.FromInteger(m_bucketMilliseconds));
		134	ret.Add("TotalMilliseconds", OSD.FromInteger(m_totalHistogramMilliseconds));
		135
		136	// Compute a number for the first bucket in the histogram.
		137	// This will allow readers to know how this histogram relates to any previously read histogram.
		138	int baseBucketNum = (m_timeBase / m_bucketMilliseconds) + m_lastBucket + 1;
		139	ret.Add("BaseNumber", OSD.FromInteger(baseBucketNum));
		140
		141	ret.Add("Values", GetHistogramAsOSDArray());
		142
		143	return ret;
		144	}
		145	// Get a copy of the current histogram
		146	public OSDArray GetHistogramAsOSDArray()
		147	{
		148	OSDArray ret = new OSDArray(m_numBuckets);
		149	lock (histoLock)
		150	{
		151	int indx = m_lastBucket + 1;
		152	for (int ii = 0; ii < m_numBuckets; ii++, indx++)
		153	{
		154	if (indx >= m_numBuckets)
		155	indx = 0;
		156	ret[ii] = OSD.FromLong(m_histogram[indx]);
		157	}
		158	}
		159	return ret;
		160	}
		161
		162	// Zero out the histogram
		163	public void Zero()
		164	{
		165	lock (histoLock)
		166	{
		167	for (int ii = 0; ii < m_numBuckets; ii++)
		168	m_histogram[ii] = 0;
		169	}
		170	}
		171	}
		172
		173	}


diff --git a/OpenSim/Framework/Monitoring/Stats/PercentageStat.cs b/OpenSim/Framework/Monitoring/Stats/PercentageStat.cs index 60bed55..55ddf06 100644 --- a/OpenSim/Framework/Monitoring/Stats/PercentageStat.cs +++ b/OpenSim/Framework/Monitoring/Stats/PercentageStat.cs
@@ -29,6 +29,8 @@ using System;
29	using System.Collections.Generic;	29	using System.Collections.Generic;
30	using System.Text;	30	using System.Text;
31		31
		32	using OpenMetaverse.StructuredData;
		33
32	namespace OpenSim.Framework.Monitoring	34	namespace OpenSim.Framework.Monitoring
33	{	35	{
34	public class PercentageStat : Stat	36	public class PercentageStat : Stat
@@ -84,5 +86,19 @@ namespace OpenSim.Framework.Monitoring
84		86
85	return sb.ToString();	87	return sb.ToString();
86	}	88	}
		89
		90	// PercentageStat is a basic stat plus percent calc
		91	public override OSDMap ToOSDMap()
		92	{
		93	// Get the foundational instance
		94	OSDMap map = base.ToOSDMap();
		95
		96	map["StatType"] = "PercentageStat";
		97
		98	map.Add("Antecedent", OSD.FromLong(Antecedent));
		99	map.Add("Consequent", OSD.FromLong(Consequent));
		100
		101	return map;
		102	}
87	}	103	}
88	} \ No newline at end of file	104	} \ No newline at end of file


diff --git a/OpenSim/Framework/Monitoring/Stats/Stat.cs b/OpenSim/Framework/Monitoring/Stats/Stat.cs index ffd5132..2b34493 100644 --- a/OpenSim/Framework/Monitoring/Stats/Stat.cs +++ b/OpenSim/Framework/Monitoring/Stats/Stat.cs
@@ -241,6 +241,8 @@ namespace OpenSim.Framework.Monitoring
241	public virtual OSDMap ToOSDMap()	241	public virtual OSDMap ToOSDMap()
242	{	242	{
243	OSDMap ret = new OSDMap();	243	OSDMap ret = new OSDMap();
		244	ret.Add("StatType", "Stat"); // used by overloading classes to denote type of stat
		245
244	ret.Add("Category", OSD.FromString(Category));	246	ret.Add("Category", OSD.FromString(Category));
245	ret.Add("Container", OSD.FromString(Container));	247	ret.Add("Container", OSD.FromString(Container));
246	ret.Add("ShortName", OSD.FromString(ShortName));	248	ret.Add("ShortName", OSD.FromString(ShortName));
@@ -248,26 +250,36 @@ namespace OpenSim.Framework.Monitoring
248	ret.Add("Description", OSD.FromString(Description));	250	ret.Add("Description", OSD.FromString(Description));
249	ret.Add("UnitName", OSD.FromString(UnitName));	251	ret.Add("UnitName", OSD.FromString(UnitName));
250	ret.Add("Value", OSD.FromReal(Value));	252	ret.Add("Value", OSD.FromReal(Value));
251	ret.Add("StatType", "Stat"); // used by overloading classes to denote type of stat	253
		254	double lastChangeOverTime, averageChangeOverTime;
		255	if (ComputeMeasuresOfInterest(out lastChangeOverTime, out averageChangeOverTime))
		256	{
		257	ret.Add("LastChangeOverTime", OSD.FromReal(lastChangeOverTime));
		258	ret.Add("AverageChangeOverTime", OSD.FromReal(averageChangeOverTime));
		259	}
252		260
253	return ret;	261	return ret;
254	}	262	}
255		263
256	protected void AppendMeasuresOfInterest(StringBuilder sb)	264	// Compute the averages over time and return same.
		265	// Return 'true' if averages were actually computed. 'false' if no average info.
		266	public bool ComputeMeasuresOfInterest(out double lastChangeOverTime, out double averageChangeOverTime)
257	{	267	{
258	if ((MeasuresOfInterest & MeasuresOfInterest.AverageChangeOverTime)	268	bool ret = false;
259	== MeasuresOfInterest.AverageChangeOverTime)	269	lastChangeOverTime = 0;
		270	averageChangeOverTime = 0;
		271
		272	if ((MeasuresOfInterest & MeasuresOfInterest.AverageChangeOverTime) == MeasuresOfInterest.AverageChangeOverTime)
260	{	273	{
261	double totalChange = 0;	274	double totalChange = 0;
262	double lastChangeOverTime = 0;
263	double? penultimateSample = null;	275	double? penultimateSample = null;
264	double? lastSample = null;	276	double? lastSample = null;
265		277
266	lock (m_samples)	278	lock (m_samples)
267	{	279	{
268	// m_log.DebugFormat(	280	// m_log.DebugFormat(
269	// "[STAT]: Samples for {0} are {1}",	281	// "[STAT]: Samples for {0} are {1}",
270	// Name, string.Join(",", m_samples.Select(s => s.ToString()).ToArray()));	282	// Name, string.Join(",", m_samples.Select(s => s.ToString()).ToArray()));
271		283
272	foreach (double s in m_samples)	284	foreach (double s in m_samples)
273	{	285	{
@@ -280,13 +292,27 @@ namespace OpenSim.Framework.Monitoring
280	}	292	}
281		293
282	if (lastSample != null && penultimateSample != null)	294	if (lastSample != null && penultimateSample != null)
283	lastChangeOverTime	295	{
		296	lastChangeOverTime
284	= ((double)lastSample - (double)penultimateSample) / (Watchdog.WATCHDOG_INTERVAL_MS / 1000);	297	= ((double)lastSample - (double)penultimateSample) / (Watchdog.WATCHDOG_INTERVAL_MS / 1000);
		298	}
285		299
286	int divisor = m_samples.Count <= 1 ? 1 : m_samples.Count - 1;	300	int divisor = m_samples.Count <= 1 ? 1 : m_samples.Count - 1;
287		301
288	double averageChangeOverTime = totalChange / divisor / (Watchdog.WATCHDOG_INTERVAL_MS / 1000);	302	averageChangeOverTime = totalChange / divisor / (Watchdog.WATCHDOG_INTERVAL_MS / 1000);
		303	ret = true;
		304	}
		305
		306	return ret;
		307	}
289		308
		309	protected void AppendMeasuresOfInterest(StringBuilder sb)
		310	{
		311	double lastChangeOverTime = 0;
		312	double averageChangeOverTime = 0;
		313
		314	if (ComputeMeasuresOfInterest(out lastChangeOverTime, out averageChangeOverTime))
		315	{
290	sb.AppendFormat(	316	sb.AppendFormat(
291	", {0:0.##}{1}/s, {2:0.##}{3}/s",	317	", {0:0.##}{1}/s, {2:0.##}{3}/s",
292	lastChangeOverTime,	318	lastChangeOverTime,