Dump OpenSim 0.9.0.1 into it's own branch.

1 files changed, 21 insertions, 5 deletions

diff --git a/OpenSim/Framework/Monitoring/BaseStatsCollector.cs b/OpenSim/Framework/Monitoring/BaseStatsCollector.cs
index 20495f6..e513abd 100644
--- a/OpenSim/Framework/Monitoring/BaseStatsCollector.cs
+++ b/OpenSim/Framework/Monitoring/BaseStatsCollector.cs
@@ -43,7 +43,6 @@ namespace OpenSim.Framework.Monitoring
             StringBuilder sb = new StringBuilder(Environment.NewLine);
             sb.Append("MEMORY STATISTICS");
             sb.Append(Environment.NewLine);
-
             sb.AppendFormat(
                 "Heap allocated to OpenSim   : {0} MB\n",
                 Math.Round(GC.GetTotalMemory(false) / 1024.0 / 1024.0));
@@ -56,13 +55,30 @@ namespace OpenSim.Framework.Monitoring
                 "Average heap allocation rate: {0} MB/s\n",
                 Math.Round((MemoryWatchdog.AverageHeapAllocationRate * 1000) / 1024.0 / 1024, 3));
 
-            sb.AppendFormat(
-                "Process memory              : {0} MB\n",
-                Math.Round(Process.GetCurrentProcess().WorkingSet64 / 1024.0 / 1024.0));
+            Process myprocess = Process.GetCurrentProcess();
+//            if (!myprocess.HasExited)
+            try
+            {
+                myprocess.Refresh();
+                sb.AppendFormat(
+                        "Process memory:      Physical {0} MB \t Paged {1} MB \t Virtual {2} MB\n",
+                        Math.Round(myprocess.WorkingSet64 / 1024.0 / 1024.0),
+                        Math.Round(myprocess.PagedMemorySize64 / 1024.0 / 1024.0),
+                        Math.Round(myprocess.VirtualMemorySize64 / 1024.0 / 1024.0));
+                sb.AppendFormat(
+                        "Peak process memory: Physical {0} MB \t Paged {1} MB \t Virtual {2} MB\n",
+                        Math.Round(myprocess.PeakWorkingSet64 / 1024.0 / 1024.0),
+                        Math.Round(myprocess.PeakPagedMemorySize64 / 1024.0 / 1024.0),
+                        Math.Round(myprocess.PeakVirtualMemorySize64 / 1024.0 / 1024.0));
+            }
+            catch
+            { }
+//            else
+//                sb.Append("Process reported as Exited \n");
 
             return sb.ToString();
         }
-        
+
         public virtual string XReport(string uptime, string version)
         {
             return (string) Math.Round(GC.GetTotalMemory(false) / 1024.0 / 1024.0).ToString() ;