From 085a87060a2ccb4910305b7c5f5374d1cc779d1a Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 20 Jun 2013 00:52:39 +0100
Subject: Change "ObjectMemory" stat to "HeapMemory" to align with other stat
 names.  Also round this and ProcessMemory to three decimal places in common
 with other memory stats.

I believe leaving out such minor info makes stats easier to read
---
 OpenSim/Framework/Monitoring/ServerStatsCollector.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'OpenSim/Framework/Monitoring')

diff --git a/OpenSim/Framework/Monitoring/ServerStatsCollector.cs b/OpenSim/Framework/Monitoring/ServerStatsCollector.cs
index b22da1d..ac0f0bc 100644
--- a/OpenSim/Framework/Monitoring/ServerStatsCollector.cs
+++ b/OpenSim/Framework/Monitoring/ServerStatsCollector.cs
@@ -239,9 +239,9 @@ namespace OpenSim.Framework.Monitoring
             }
 
             MakeStat("ProcessMemory", null, "MB", ContainerMemory,
-                                (s) => { s.Value = Process.GetCurrentProcess().WorkingSet64 / 1024d / 1024d; });
-            MakeStat("ObjectMemory", null, "MB", ContainerMemory,
-                                (s) => { s.Value = GC.GetTotalMemory(false) / 1024d / 1024d; });
+                                (s) => { s.Value = Math.Round(Process.GetCurrentProcess().WorkingSet64 / 1024d / 1024d, 3); });
+            MakeStat("HeapMemory", null, "MB", ContainerMemory,
+                                (s) => { s.Value = Math.Round(GC.GetTotalMemory(false) / 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,
-- 
cgit v1.1