aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Statistics
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2012-03-16 02:43:33 +0000
committerJustin Clark-Casey (justincc)2012-03-16 02:43:33 +0000
commit421b562a045c69c5d507ee33e0283613d133e376 (patch)
tree22b9e359939869b7b18127c63fef06659977133c /OpenSim/Framework/Statistics
parentMove startup_commands.txt.example to startup_commands.txt for consistency wit... (diff)
downloadopensim-SC_OLD-421b562a045c69c5d507ee33e0283613d133e376.zip
opensim-SC_OLD-421b562a045c69c5d507ee33e0283613d133e376.tar.gz
opensim-SC_OLD-421b562a045c69c5d507ee33e0283613d133e376.tar.bz2
opensim-SC_OLD-421b562a045c69c5d507ee33e0283613d133e376.tar.xz
Add process working memory to "show stats" memory statistics.
This shows the actual amount of RAM being taken up by OpenSimulator (objects + vm overhead)
Diffstat (limited to 'OpenSim/Framework/Statistics')
-rw-r--r--OpenSim/Framework/Statistics/BaseStatsCollector.cs8
1 files changed, 6 insertions, 2 deletions
diff --git a/OpenSim/Framework/Statistics/BaseStatsCollector.cs b/OpenSim/Framework/Statistics/BaseStatsCollector.cs
index a1841c5..c9e57ce 100644
--- a/OpenSim/Framework/Statistics/BaseStatsCollector.cs
+++ b/OpenSim/Framework/Statistics/BaseStatsCollector.cs
@@ -26,8 +26,8 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Diagnostics;
29using System.Text; 30using System.Text;
30
31using OpenMetaverse; 31using OpenMetaverse;
32using OpenMetaverse.StructuredData; 32using OpenMetaverse.StructuredData;
33 33
@@ -46,8 +46,12 @@ namespace OpenSim.Framework.Statistics
46 sb.Append(Environment.NewLine); 46 sb.Append(Environment.NewLine);
47 sb.Append( 47 sb.Append(
48 string.Format( 48 string.Format(
49 "Allocated to OpenSim : {0} MB" + Environment.NewLine, 49 "Allocated to OpenSim objects: {0} MB\n",
50 Math.Round(GC.GetTotalMemory(false) / 1024.0 / 1024.0))); 50 Math.Round(GC.GetTotalMemory(false) / 1024.0 / 1024.0)));
51 sb.Append(
52 string.Format(
53 "Process memory : {0} MB\n",
54 Math.Round(Process.GetCurrentProcess().WorkingSet64 / 1024.0 / 1024.0)));
51 55
52 return sb.ToString(); 56 return sb.ToString();
53 } 57 }