From bebdc29effc9c588ea14c98190f029662a0f46a0 Mon Sep 17 00:00:00 2001
From: Steven Zielinski
Date: Tue, 28 Apr 2015 15:52:25 -0400
Subject: Changed the 10 value to be a constant value inside of the Scene
called m_DefaultNumberFramesStored.
Test Plan: Tested on windows with the json stats reporter.
Reviewers: rlouden, ssirigam, martin, kboswell, clattin
Differential Revision: http://cr.irl.ucf.edu/D273
---
OpenSim/Region/Framework/Scenes/Scene.cs | 19 +++++++++++--------
OpenSim/Region/Framework/Scenes/SimStatsReporter.cs | 2 +-
2 files changed, 12 insertions(+), 9 deletions(-)
(limited to 'OpenSim')
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 906c862..345cc81 100755
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -61,6 +61,8 @@ namespace OpenSim.Region.Framework.Scenes
{
private const long DEFAULT_MIN_TIME_FOR_PERSISTENCE = 60L;
private const long DEFAULT_MAX_TIME_FOR_PERSISTENCE = 600L;
+
+ public const int m_DefaultNumberFramesStored = 10;
public delegate void SynchronizeSceneHandler(Scene scene);
@@ -1115,17 +1117,18 @@ namespace OpenSim.Region.Framework.Scenes
// file
if (statisticsConfig != null)
{
- // Create the StatsReporter using the number of frames to store
- // for the frame time statistics, or 10 frames if the config
- // file doesn't contain a value
- StatsReporter = new SimStatsReporter(this,
- statisticsConfig.GetInt("NumberOfFrames", 10));
+ // Create the StatsReporter using the number of frames to store
+ // for the frame time statistics, or 10 frames if the config
+ // file doesn't contain a value
+ StatsReporter = new SimStatsReporter(this,
+ statisticsConfig.GetInt("NumberOfFrames",
+ m_DefaultNumberFramesStored));
}
else
{
- // Create a StatsReporter with the current scene and a default
- // 10 frames stored for the frame time statistics
- StatsReporter = new SimStatsReporter(this);
+ // Create a StatsReporter with the current scene and a default
+ // 10 frames stored for the frame time statistics
+ StatsReporter = new SimStatsReporter(this);
}
StatsReporter.OnSendStatsResult += SendSimStatsPackets;
diff --git a/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs b/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
index 6182bcd..d90d2b3 100755
--- a/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
+++ b/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
@@ -217,7 +217,7 @@ namespace OpenSim.Region.Framework.Scenes
// the Total, Simulation, Physics, and Network Frame Time; It is set to
// 10 by default but can be changed by the OpenSim.ini configuration file
// NumberOfFrames parameter
- private int m_numberFramesStored = 10;
+ private int m_numberFramesStored = Scene.m_DefaultNumberFramesStored;
// The arrays that will hold the time it took to run the past N frames,
// where N is the num_frames_to_average given by the configuration file
--
cgit v1.1
From cb3c6038af6cf7e3d749250c4aa2596967ef8d70 Mon Sep 17 00:00:00 2001
From: Steven Zielinski
Date: Wed, 29 Apr 2015 08:51:19 -0400
Subject: Changed the 10 value to be a constant value inside of the Scene
called m_DefaultNumberFramesStored.
Test Plan: Tested on windows with the json stats reporter.
Reviewers: rlouden, kboswell, clattin, ssirigam, martin
Reviewed By: rlouden, kboswell, clattin, ssirigam, martin
Differential Revision: http://cr.irl.ucf.edu/D273
---
OpenSim/Region/Framework/Scenes/Scene.cs | 4 ++--
OpenSim/Region/Framework/Scenes/SimStatsReporter.cs | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
(limited to 'OpenSim')
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 345cc81..438dce9 100755
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -62,7 +62,7 @@ namespace OpenSim.Region.Framework.Scenes
private const long DEFAULT_MIN_TIME_FOR_PERSISTENCE = 60L;
private const long DEFAULT_MAX_TIME_FOR_PERSISTENCE = 600L;
- public const int m_DefaultNumberFramesStored = 10;
+ public const int m_defaultNumberFramesStored = 10;
public delegate void SynchronizeSceneHandler(Scene scene);
@@ -1122,7 +1122,7 @@ namespace OpenSim.Region.Framework.Scenes
// file doesn't contain a value
StatsReporter = new SimStatsReporter(this,
statisticsConfig.GetInt("NumberOfFrames",
- m_DefaultNumberFramesStored));
+ m_defaultNumberFramesStored));
}
else
{
diff --git a/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs b/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
index d90d2b3..0eab898 100755
--- a/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
+++ b/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
@@ -217,7 +217,7 @@ namespace OpenSim.Region.Framework.Scenes
// the Total, Simulation, Physics, and Network Frame Time; It is set to
// 10 by default but can be changed by the OpenSim.ini configuration file
// NumberOfFrames parameter
- private int m_numberFramesStored = Scene.m_DefaultNumberFramesStored;
+ private int m_numberFramesStored = Scene.m_defaultNumberFramesStored;
// The arrays that will hold the time it took to run the past N frames,
// where N is the num_frames_to_average given by the configuration file
--
cgit v1.1