From 0f4cdc0c5bb750ec4ab7b100dc82d3ff08c9e427 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 6 Mar 2012 19:05:32 +0000
Subject: Explictly close down the StatsReporter so that we can shutdown its
 timer

This is another step necessary for the scene to be garbage collected between performance tests
---
 OpenSim/Region/Framework/Scenes/SimStatsReporter.cs | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'OpenSim/Region/Framework/Scenes/SimStatsReporter.cs')

diff --git a/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs b/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
index 35cd025..210f48d 100644
--- a/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
+++ b/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
@@ -185,6 +185,12 @@ namespace OpenSim.Region.Framework.Scenes
                 OnSendStatsResult += StatsManager.SimExtraStats.ReceiveClassicSimStatsPacket;
         }
 
+        public void Close()
+        {
+            m_report.Elapsed -= statsHeartBeat;
+            m_report.Close();
+        }
+
         public void SetUpdateMS(int ms)
         {
             statsUpdatesEveryMS = ms;
-- 
cgit v1.1


From e9d8eb5a270645ece83c864dbd3c84bf226a57f7 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 6 Mar 2012 22:31:25 +0000
Subject: Remove unnecessary explicit ElapsedEventHandler in SimReporter

---
 OpenSim/Region/Framework/Scenes/SimStatsReporter.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'OpenSim/Region/Framework/Scenes/SimStatsReporter.cs')

diff --git a/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs b/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
index 210f48d..5c56264 100644
--- a/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
+++ b/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
@@ -178,7 +178,7 @@ namespace OpenSim.Region.Framework.Scenes
             m_objectCapacity = scene.RegionInfo.ObjectCapacity;
             m_report.AutoReset = true;
             m_report.Interval = statsUpdatesEveryMS;
-            m_report.Elapsed += new ElapsedEventHandler(statsHeartBeat);
+            m_report.Elapsed += statsHeartBeat;
             m_report.Enabled = true;
 
             if (StatsManager.SimExtraStats != null)
-- 
cgit v1.1