diff options
| author | BlueWall | 2012-10-20 05:25:58 -0400 |
|---|---|---|
| committer | BlueWall | 2012-10-20 05:25:58 -0400 |
| commit | 07f1d44174f5e2b4e3d5ffdec3619bb84f357af2 (patch) | |
| tree | 83cc0442b2c1b89a5b3dd94cff23d5098415777e /OpenSim/Framework/Monitoring/BaseStatsCollector.cs | |
| parent | Merge branch 'master' into connector_plugin (diff) | |
| parent | Fix: invinite loading for Viewer3 : parcelinfo request of traffic-value (impl... (diff) | |
| download | opensim-SC-07f1d44174f5e2b4e3d5ffdec3619bb84f357af2.zip opensim-SC-07f1d44174f5e2b4e3d5ffdec3619bb84f357af2.tar.gz opensim-SC-07f1d44174f5e2b4e3d5ffdec3619bb84f357af2.tar.bz2 opensim-SC-07f1d44174f5e2b4e3d5ffdec3619bb84f357af2.tar.xz | |
Merge branch 'master' into connector_plugin
Diffstat (limited to 'OpenSim/Framework/Monitoring/BaseStatsCollector.cs')
| -rw-r--r-- | OpenSim/Framework/Monitoring/BaseStatsCollector.cs | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/OpenSim/Framework/Monitoring/BaseStatsCollector.cs b/OpenSim/Framework/Monitoring/BaseStatsCollector.cs index 57a63ef..2903b6e 100644 --- a/OpenSim/Framework/Monitoring/BaseStatsCollector.cs +++ b/OpenSim/Framework/Monitoring/BaseStatsCollector.cs | |||
| @@ -49,7 +49,11 @@ namespace OpenSim.Framework.Monitoring | |||
| 49 | Math.Round(GC.GetTotalMemory(false) / 1024.0 / 1024.0)); | 49 | Math.Round(GC.GetTotalMemory(false) / 1024.0 / 1024.0)); |
| 50 | 50 | ||
| 51 | sb.AppendFormat( | 51 | sb.AppendFormat( |
| 52 | "OpenSim object memory churn : {0} MB/s\n", | 52 | "OpenSim last object memory churn : {0} MB/s\n", |
| 53 | Math.Round((MemoryWatchdog.LastMemoryChurn * 1000) / 1024.0 / 1024, 3)); | ||
| 54 | |||
| 55 | sb.AppendFormat( | ||
| 56 | "OpenSim average object memory churn : {0} MB/s\n", | ||
| 53 | Math.Round((MemoryWatchdog.AverageMemoryChurn * 1000) / 1024.0 / 1024, 3)); | 57 | Math.Round((MemoryWatchdog.AverageMemoryChurn * 1000) / 1024.0 / 1024, 3)); |
| 54 | 58 | ||
| 55 | sb.AppendFormat( | 59 | sb.AppendFormat( |