1 files changed, 16 insertions, 19 deletions

diff --git a/OpenSim/Framework/Monitoring/BaseStatsCollector.cs b/OpenSim/Framework/Monitoring/BaseStatsCollector.cs
index e513abd..7119964 100644
--- a/OpenSim/Framework/Monitoring/BaseStatsCollector.cs
+++ b/OpenSim/Framework/Monitoring/BaseStatsCollector.cs
@@ -48,28 +48,25 @@ namespace OpenSim.Framework.Monitoring
                 Math.Round(GC.GetTotalMemory(false) / 1024.0 / 1024.0));
 
             sb.AppendFormat(
-                "Last heap allocation rate   : {0} MB/s\n",
-                Math.Round((MemoryWatchdog.LastHeapAllocationRate * 1000) / 1024.0 / 1024, 3));
+                "Heap allocation rate (last/avg): {0}/{1}MB/s\n",
+                Math.Round((MemoryWatchdog.LastHeapAllocationRate * 1000) / 1048576.0, 3),
+                Math.Round((MemoryWatchdog.AverageHeapAllocationRate * 1000) / 1048576.0, 3));
 
-            sb.AppendFormat(
-                "Average heap allocation rate: {0} MB/s\n",
-                Math.Round((MemoryWatchdog.AverageHeapAllocationRate * 1000) / 1024.0 / 1024, 3));
-
-            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));
+                using (Process myprocess = Process.GetCurrentProcess())
+                {
+                    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
             { }