OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

cpu-performance
Justin Clark-Casey (justincc) 2013-06-20 00:32:12 +01:00
parent d97333255d
commit 5b1a9f84fd
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
OpenSim/Framework/Monitoring/BaseStatsCollector.cs
View File

@ -1,4 +1,4 @@
/* /*
* Copyright (c) Contributors, http://opensimulator.org/ * Copyright (c) Contributors, http://opensimulator.org/
* See CONTRIBUTORS.TXT for a full list of copyright holders. * See CONTRIBUTORS.TXT for a full list of copyright holders.
* *
@ -45,16 +45,16 @@ namespace OpenSim.Framework.Monitoring
sb.Append(Environment.NewLine); sb.Append(Environment.NewLine);
sb.AppendFormat( 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)); Math.Round(GC.GetTotalMemory(false) / 1024.0 / 1024.0));
sb.AppendFormat( sb.AppendFormat(
"OpenSim last object memory churn : {0} MB/s\n", "Last heap allocation rate : {0} MB/s\n",
Math.Round((MemoryWatchdog.LastMemoryChurn * 1000) / 1024.0 / 1024, 3)); Math.Round((MemoryWatchdog.LastHeapAllocationRate * 1000) / 1024.0 / 1024, 3));
sb.AppendFormat( sb.AppendFormat(
"OpenSim average object memory churn : {0} MB/s\n", "Average heap allocation rate: {0} MB/s\n",
Math.Round((MemoryWatchdog.AverageMemoryChurn * 1000) / 1024.0 / 1024, 3)); Math.Round((MemoryWatchdog.AverageHeapAllocationRate * 1000) / 1024.0 / 1024, 3));
sb.AppendFormat( sb.AppendFormat(
"Process memory : {0} MB\n", "Process memory : {0} MB\n",

8
OpenSim/Framework/Monitoring/MemoryWatchdog.cs
View File

@ -60,17 +60,17 @@ namespace OpenSim.Framework.Monitoring
private static bool m_enabled; private static bool m_enabled;
/// <summary> /// <summary>
/// Last memory churn in bytes per millisecond. /// Average heap allocation rate in bytes per millisecond.
/// </summary> /// </summary>
public static double AverageMemoryChurn public static double AverageHeapAllocationRate
{ {
get { if (m_samples.Count > 0) return m_samples.Average(); else return 0; } get { if (m_samples.Count > 0) return m_samples.Average(); else return 0; }
} }
/// <summary> /// <summary>
/// Average memory churn in bytes per millisecond. /// Last heap allocation in bytes
/// </summary> /// </summary>
public static double LastMemoryChurn public static double LastHeapAllocationRate
{ {
get { if (m_samples.Count > 0) return m_samples.Last(); else return 0; } get { if (m_samples.Count > 0) return m_samples.Last(); else return 0; }
} }

8
OpenSim/Framework/Monitoring/ServerStatsCollector.cs
View File

@ -242,10 +242,10 @@ namespace OpenSim.Framework.Monitoring
(s) => { s.Value = Process.GetCurrentProcess().WorkingSet64 / 1024d / 1024d; }); (s) => { s.Value = Process.GetCurrentProcess().WorkingSet64 / 1024d / 1024d; });
MakeStat("ObjectMemory", null, "MB", ContainerMemory, MakeStat("ObjectMemory", null, "MB", ContainerMemory,
(s) => { s.Value = GC.GetTotalMemory(false) / 1024d / 1024d; }); (s) => { s.Value = GC.GetTotalMemory(false) / 1024d / 1024d; });
MakeStat("LastMemoryChurn", null, "MB/sec", ContainerMemory, MakeStat("LastHeapAllocationRate", null, "MB/sec", ContainerMemory,
(s) => { s.Value = Math.Round(MemoryWatchdog.LastMemoryChurn * 1000d / 1024d / 1024d, 3); }); (s) => { s.Value = Math.Round(MemoryWatchdog.LastHeapAllocationRate * 1000d / 1024d / 1024d, 3); });
MakeStat("AverageMemoryChurn", null, "MB/sec", ContainerMemory, MakeStat("AverageHeapAllocationRate", null, "MB/sec", ContainerMemory,
(s) => { s.Value = Math.Round(MemoryWatchdog.AverageMemoryChurn * 1000d / 1024d / 1024d, 3); }); (s) => { s.Value = Math.Round(MemoryWatchdog.AverageHeapAllocationRate * 1000d / 1024d / 1024d, 3); });
} }
// Notes on performance counters: // Notes on performance counters: