diff options
| author | Justin Clark-Casey (justincc) | 2013-06-20 00:32:12 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2013-06-20 00:32:12 +0100 |
| commit | 5b1a9f84fdf4f9938180b403dd002b44e25c6efb (patch) | |
| tree | f61da98b6dd3c37ef1036bbd5caeed68db4b732e /OpenSim/Framework/Monitoring/ServerStatsCollector.cs | |
| parent | Fix minor bug where the check whether to display SmartThreadPool stats was ac... (diff) | |
| download | opensim-SC_OLD-5b1a9f84fdf4f9938180b403dd002b44e25c6efb.zip opensim-SC_OLD-5b1a9f84fdf4f9938180b403dd002b44e25c6efb.tar.gz opensim-SC_OLD-5b1a9f84fdf4f9938180b403dd002b44e25c6efb.tar.bz2 opensim-SC_OLD-5b1a9f84fdf4f9938180b403dd002b44e25c6efb.tar.xz | |
minor: Change "memory churn" terminology in statistics to "heap allocation rate" since this is more generally meaningful
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Framework/Monitoring/ServerStatsCollector.cs | 8 |
1 files changed, 4 insertions, 4 deletions
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 | |||
| 242 | (s) => { s.Value = Process.GetCurrentProcess().WorkingSet64 / 1024d / 1024d; }); | 242 | (s) => { s.Value = Process.GetCurrentProcess().WorkingSet64 / 1024d / 1024d; }); |
| 243 | MakeStat("ObjectMemory", null, "MB", ContainerMemory, | 243 | MakeStat("ObjectMemory", null, "MB", ContainerMemory, |
| 244 | (s) => { s.Value = GC.GetTotalMemory(false) / 1024d / 1024d; }); | 244 | (s) => { s.Value = GC.GetTotalMemory(false) / 1024d / 1024d; }); |
| 245 | MakeStat("LastMemoryChurn", null, "MB/sec", ContainerMemory, | 245 | MakeStat("LastHeapAllocationRate", null, "MB/sec", ContainerMemory, |
| 246 | (s) => { s.Value = Math.Round(MemoryWatchdog.LastMemoryChurn * 1000d / 1024d / 1024d, 3); }); | 246 | (s) => { s.Value = Math.Round(MemoryWatchdog.LastHeapAllocationRate * 1000d / 1024d / 1024d, 3); }); |
| 247 | MakeStat("AverageMemoryChurn", null, "MB/sec", ContainerMemory, | 247 | MakeStat("AverageHeapAllocationRate", null, "MB/sec", ContainerMemory, |
| 248 | (s) => { s.Value = Math.Round(MemoryWatchdog.AverageMemoryChurn * 1000d / 1024d / 1024d, 3); }); | 248 | (s) => { s.Value = Math.Round(MemoryWatchdog.AverageHeapAllocationRate * 1000d / 1024d / 1024d, 3); }); |
| 249 | } | 249 | } |
| 250 | 250 | ||
| 251 | // Notes on performance counters: | 251 | // Notes on performance counters: |