minor: Change "memory churn" terminology in statistics to "heap allocation rate" since this is more generally meaningful

3 files changed, 14 insertions, 14 deletions

diff --git a/OpenSim/Framework/Monitoring/BaseStatsCollector.cs b/OpenSim/Framework/Monitoring/BaseStatsCollector.cs
index be1d02b..20495f6 100644
--- a/OpenSim/Framework/Monitoring/BaseStatsCollector.cs
+++ b/OpenSim/Framework/Monitoring/BaseStatsCollector.cs
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) Contributors, http://opensimulator.org/
  * See CONTRIBUTORS.TXT for a full list of copyright holders.
  *
@@ -45,16 +45,16 @@ namespace OpenSim.Framework.Monitoring
             sb.Append(Environment.NewLine);
 
             sb.AppendFormat(
-                "Allocated to OpenSim objects: {0} MB\n",
+                "Heap allocated to OpenSim   : {0} MB\n",
                 Math.Round(GC.GetTotalMemory(false) / 1024.0 / 1024.0));
 
             sb.AppendFormat(
-                "OpenSim last object memory churn    : {0} MB/s\n",
-                Math.Round((MemoryWatchdog.LastMemoryChurn * 1000) / 1024.0 / 1024, 3));
+                "Last heap allocation rate   : {0} MB/s\n",
+                Math.Round((MemoryWatchdog.LastHeapAllocationRate * 1000) / 1024.0 / 1024, 3));
 
             sb.AppendFormat(
-                "OpenSim average object memory churn : {0} MB/s\n",
-                Math.Round((MemoryWatchdog.AverageMemoryChurn * 1000) / 1024.0 / 1024, 3));
+                "Average heap allocation rate: {0} MB/s\n",
+                Math.Round((MemoryWatchdog.AverageHeapAllocationRate * 1000) / 1024.0 / 1024, 3));
 
             sb.AppendFormat(
                 "Process memory              : {0} MB\n",
diff --git a/OpenSim/Framework/Monitoring/MemoryWatchdog.cs b/OpenSim/Framework/Monitoring/MemoryWatchdog.cs
index c6010cd..c474622 100644
--- a/OpenSim/Framework/Monitoring/MemoryWatchdog.cs
+++ b/OpenSim/Framework/Monitoring/MemoryWatchdog.cs
@@ -60,17 +60,17 @@ namespace OpenSim.Framework.Monitoring
         private static bool m_enabled;
 
         /// <summary>
-        /// Last memory churn in bytes per millisecond.
+        /// Average heap allocation rate in bytes per millisecond.
         /// </summary>
-        public static double AverageMemoryChurn
+        public static double AverageHeapAllocationRate
         {
             get { if (m_samples.Count > 0) return m_samples.Average(); else return 0; }
         }
 
         /// <summary>
-        /// Average memory churn in bytes per millisecond.
+        /// Last heap allocation in bytes
         /// </summary>
-        public static double LastMemoryChurn
+        public static double LastHeapAllocationRate
         {
             get { if (m_samples.Count > 0) return m_samples.Last(); else return 0; }
         }
diff --git a/OpenSim/Framework/Monitoring/ServerStatsCollector.cs b/OpenSim/Framework/Monitoring/ServerStatsCollector.cs
index 5d1c270..b22da1d 100644
--- a/OpenSim/Framework/Monitoring/ServerStatsCollector.cs
+++ b/OpenSim/Framework/Monitoring/ServerStatsCollector.cs
@@ -242,10 +242,10 @@ namespace OpenSim.Framework.Monitoring
                                 (s) => { s.Value = Process.GetCurrentProcess().WorkingSet64 / 1024d / 1024d; });
             MakeStat("ObjectMemory", null, "MB", ContainerMemory,
                                 (s) => { s.Value = GC.GetTotalMemory(false) / 1024d / 1024d; });
-            MakeStat("LastMemoryChurn", null, "MB/sec", ContainerMemory,
-                                (s) => { s.Value = Math.Round(MemoryWatchdog.LastMemoryChurn * 1000d / 1024d / 1024d, 3); });
-            MakeStat("AverageMemoryChurn", null, "MB/sec", ContainerMemory,
-                                (s) => { s.Value = Math.Round(MemoryWatchdog.AverageMemoryChurn * 1000d / 1024d / 1024d, 3); });
+            MakeStat("LastHeapAllocationRate", null, "MB/sec", ContainerMemory,
+                                (s) => { s.Value = Math.Round(MemoryWatchdog.LastHeapAllocationRate * 1000d / 1024d / 1024d, 3); });
+            MakeStat("AverageHeapAllocationRate", null, "MB/sec", ContainerMemory,
+                                (s) => { s.Value = Math.Round(MemoryWatchdog.AverageHeapAllocationRate * 1000d / 1024d / 1024d, 3); });
         }
 
         // Notes on performance counters: