OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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
fsassets
Steven Zielinski 2015-04-28 15:52:25 -04:00
parent 0b3adc961b
commit bebdc29eff
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
OpenSim/Region/Framework/Scenes/Scene.cs
View File

@ -61,6 +61,8 @@ namespace OpenSim.Region.Framework.Scenes
{ {
private const long DEFAULT_MIN_TIME_FOR_PERSISTENCE = 60L; private const long DEFAULT_MIN_TIME_FOR_PERSISTENCE = 60L;
private const long DEFAULT_MAX_TIME_FOR_PERSISTENCE = 600L; private const long DEFAULT_MAX_TIME_FOR_PERSISTENCE = 600L;
public const int m_DefaultNumberFramesStored = 10;
public delegate void SynchronizeSceneHandler(Scene scene); public delegate void SynchronizeSceneHandler(Scene scene);
@ -1115,17 +1117,18 @@ namespace OpenSim.Region.Framework.Scenes
// file // file
if (statisticsConfig != null) if (statisticsConfig != null)
{ {
// Create the StatsReporter using the number of frames to store // Create the StatsReporter using the number of frames to store
// for the frame time statistics, or 10 frames if the config // for the frame time statistics, or 10 frames if the config
// file doesn't contain a value // file doesn't contain a value
StatsReporter = new SimStatsReporter(this, StatsReporter = new SimStatsReporter(this,
statisticsConfig.GetInt("NumberOfFrames", 10)); statisticsConfig.GetInt("NumberOfFrames",
m_DefaultNumberFramesStored));
} }
else else
{ {
// Create a StatsReporter with the current scene and a default // Create a StatsReporter with the current scene and a default
// 10 frames stored for the frame time statistics // 10 frames stored for the frame time statistics
StatsReporter = new SimStatsReporter(this); StatsReporter = new SimStatsReporter(this);
} }
StatsReporter.OnSendStatsResult += SendSimStatsPackets; StatsReporter.OnSendStatsResult += SendSimStatsPackets;

2
OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
View File

@ -217,7 +217,7 @@ namespace OpenSim.Region.Framework.Scenes
// the Total, Simulation, Physics, and Network Frame Time; It is set to // 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 // 10 by default but can be changed by the OpenSim.ini configuration file
// NumberOfFrames parameter // 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, // 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 // where N is the num_frames_to_average given by the configuration file