aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2013-06-20 00:52:39 +0100
committerJustin Clark-Casey (justincc)2013-06-20 00:52:39 +0100
commit085a87060a2ccb4910305b7c5f5374d1cc779d1a (patch)
tree03d2daa946614a4fcb12b02c7d6ef1e52801c4da
parentAllow more than one stat category to be specified in "show stats" (diff)
downloadopensim-SC_OLD-085a87060a2ccb4910305b7c5f5374d1cc779d1a.zip
opensim-SC_OLD-085a87060a2ccb4910305b7c5f5374d1cc779d1a.tar.gz
opensim-SC_OLD-085a87060a2ccb4910305b7c5f5374d1cc779d1a.tar.bz2
opensim-SC_OLD-085a87060a2ccb4910305b7c5f5374d1cc779d1a.tar.xz
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
-rw-r--r--OpenSim/Framework/Monitoring/ServerStatsCollector.cs6
1 files changed, 3 insertions, 3 deletions
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
239 } 239 }
240 240
241 MakeStat("ProcessMemory", null, "MB", ContainerMemory, 241 MakeStat("ProcessMemory", null, "MB", ContainerMemory,
242 (s) => { s.Value = Process.GetCurrentProcess().WorkingSet64 / 1024d / 1024d; }); 242 (s) => { s.Value = Math.Round(Process.GetCurrentProcess().WorkingSet64 / 1024d / 1024d, 3); });
243 MakeStat("ObjectMemory", null, "MB", ContainerMemory, 243 MakeStat("HeapMemory", null, "MB", ContainerMemory,
244 (s) => { s.Value = GC.GetTotalMemory(false) / 1024d / 1024d; }); 244 (s) => { s.Value = Math.Round(GC.GetTotalMemory(false) / 1024d / 1024d, 3); });
245 MakeStat("LastHeapAllocationRate", null, "MB/sec", ContainerMemory, 245 MakeStat("LastHeapAllocationRate", null, "MB/sec", ContainerMemory,
246 (s) => { s.Value = Math.Round(MemoryWatchdog.LastHeapAllocationRate * 1000d / 1024d / 1024d, 3); }); 246 (s) => { s.Value = Math.Round(MemoryWatchdog.LastHeapAllocationRate * 1000d / 1024d / 1024d, 3); });
247 MakeStat("AverageHeapAllocationRate", null, "MB/sec", ContainerMemory, 247 MakeStat("AverageHeapAllocationRate", null, "MB/sec", ContainerMemory,