diff options
author | Justin Clark-Casey (justincc) | 2012-03-16 02:43:33 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2012-03-19 21:32:16 +0000 |
commit | 20b0fda3bb6159382ebb7cb5c4b359f87f4dac12 (patch) | |
tree | 793f04f7a27229a437a061fd22edc63d2208a57e /OpenSim/Framework/Statistics | |
parent | In Top Scripts report, don't show scripts with no or less than 1 microsecond ... (diff) | |
download | opensim-SC_OLD-20b0fda3bb6159382ebb7cb5c4b359f87f4dac12.zip opensim-SC_OLD-20b0fda3bb6159382ebb7cb5c4b359f87f4dac12.tar.gz opensim-SC_OLD-20b0fda3bb6159382ebb7cb5c4b359f87f4dac12.tar.bz2 opensim-SC_OLD-20b0fda3bb6159382ebb7cb5c4b359f87f4dac12.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.cs | 8 |
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 | ||
28 | using System; | 28 | using System; |
29 | using System.Diagnostics; | ||
29 | using System.Text; | 30 | using System.Text; |
30 | |||
31 | using OpenMetaverse; | 31 | using OpenMetaverse; |
32 | using OpenMetaverse.StructuredData; | 32 | using 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 | } |