diff options
author | Justin Clark-Casey (justincc) | 2012-03-06 19:05:32 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2012-03-06 19:05:32 +0000 |
commit | 0f4cdc0c5bb750ec4ab7b100dc82d3ff08c9e427 (patch) | |
tree | bd8fe31cdfcb0da2d2e81a7d82e39e2eab81e5e7 | |
parent | Fix TestSyntaxError() and TestSyntaxErrorDeclaringVariableInForLoop() (diff) | |
download | opensim-SC-0f4cdc0c5bb750ec4ab7b100dc82d3ff08c9e427.zip opensim-SC-0f4cdc0c5bb750ec4ab7b100dc82d3ff08c9e427.tar.gz opensim-SC-0f4cdc0c5bb750ec4ab7b100dc82d3ff08c9e427.tar.bz2 opensim-SC-0f4cdc0c5bb750ec4ab7b100dc82d3ff08c9e427.tar.xz |
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
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SimStatsReporter.cs | 6 |
2 files changed, 8 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index a01b851..6b28581 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -1076,6 +1076,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
1076 | { | 1076 | { |
1077 | m_log.InfoFormat("[SCENE]: Closing down the single simulator: {0}", RegionInfo.RegionName); | 1077 | m_log.InfoFormat("[SCENE]: Closing down the single simulator: {0}", RegionInfo.RegionName); |
1078 | 1078 | ||
1079 | StatsReporter.Close(); | ||
1080 | |||
1079 | m_restartTimer.Stop(); | 1081 | m_restartTimer.Stop(); |
1080 | m_restartTimer.Close(); | 1082 | m_restartTimer.Close(); |
1081 | 1083 | ||
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 | |||
185 | OnSendStatsResult += StatsManager.SimExtraStats.ReceiveClassicSimStatsPacket; | 185 | OnSendStatsResult += StatsManager.SimExtraStats.ReceiveClassicSimStatsPacket; |
186 | } | 186 | } |
187 | 187 | ||
188 | public void Close() | ||
189 | { | ||
190 | m_report.Elapsed -= statsHeartBeat; | ||
191 | m_report.Close(); | ||
192 | } | ||
193 | |||
188 | public void SetUpdateMS(int ms) | 194 | public void SetUpdateMS(int ms) |
189 | { | 195 | { |
190 | statsUpdatesEveryMS = ms; | 196 | statsUpdatesEveryMS = ms; |