diff options
| author | Melanie | 2012-07-11 14:27:33 +0100 |
|---|---|---|
| committer | Melanie | 2012-07-11 14:27:33 +0100 |
| commit | 89c9528e38b4e06a2af6231ced4ed733bbafa174 (patch) | |
| tree | aed380f4bc51d9102e593446762f476694b9d87c /OpenSim/Framework/Statistics | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | remove expensive and leaked ( in Xengine at least) SayShout timer and (diff) | |
| download | opensim-SC-89c9528e38b4e06a2af6231ced4ed733bbafa174.zip opensim-SC-89c9528e38b4e06a2af6231ced4ed733bbafa174.tar.gz opensim-SC-89c9528e38b4e06a2af6231ced4ed733bbafa174.tar.bz2 opensim-SC-89c9528e38b4e06a2af6231ced4ed733bbafa174.tar.xz | |
Merge branch 'avination' into careminster
Conflicts:
OpenSim/Data/MySQL/MySQLSimulationData.cs
Diffstat (limited to 'OpenSim/Framework/Statistics')
| -rw-r--r-- | OpenSim/Framework/Statistics/BaseStatsCollector.cs | 24 |
1 files changed, 20 insertions, 4 deletions
diff --git a/OpenSim/Framework/Statistics/BaseStatsCollector.cs b/OpenSim/Framework/Statistics/BaseStatsCollector.cs index c9e57ce..3f918f3 100644 --- a/OpenSim/Framework/Statistics/BaseStatsCollector.cs +++ b/OpenSim/Framework/Statistics/BaseStatsCollector.cs | |||
| @@ -48,10 +48,26 @@ namespace OpenSim.Framework.Statistics | |||
| 48 | string.Format( | 48 | string.Format( |
| 49 | "Allocated to OpenSim objects: {0} MB\n", | 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( | 51 | |
| 52 | string.Format( | 52 | Process myprocess = Process.GetCurrentProcess(); |
| 53 | "Process memory : {0} MB\n", | 53 | if (!myprocess.HasExited) |
| 54 | Math.Round(Process.GetCurrentProcess().WorkingSet64 / 1024.0 / 1024.0))); | 54 | { |
| 55 | myprocess.Refresh(); | ||
| 56 | sb.Append( | ||
| 57 | string.Format( | ||
| 58 | "Process memory: Physical {0} MB \t Paged {1} MB \t Virtual {2} MB\n", | ||
| 59 | Math.Round(Process.GetCurrentProcess().WorkingSet64 / 1024.0 / 1024.0), | ||
| 60 | Math.Round(Process.GetCurrentProcess().PagedMemorySize64 / 1024.0 / 1024.0), | ||
| 61 | Math.Round(Process.GetCurrentProcess().VirtualMemorySize64 / 1024.0 / 1024.0))); | ||
| 62 | sb.Append( | ||
| 63 | string.Format( | ||
| 64 | "Peak process memory: Physical {0} MB \t Paged {1} MB \t Virtual {2} MB\n", | ||
| 65 | Math.Round(Process.GetCurrentProcess().PeakWorkingSet64 / 1024.0 / 1024.0), | ||
| 66 | Math.Round(Process.GetCurrentProcess().PeakPagedMemorySize64 / 1024.0 / 1024.0), | ||
| 67 | Math.Round(Process.GetCurrentProcess().PeakVirtualMemorySize64 / 1024.0 / 1024.0))); | ||
| 68 | } | ||
| 69 | else | ||
| 70 | sb.Append("Process reported as Exited \n"); | ||
| 55 | 71 | ||
| 56 | return sb.ToString(); | 72 | return sb.ToString(); |
| 57 | } | 73 | } |