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

Updated phase 2 to have the changes originally done in phase 1 for the defaultNumberFramesStored. 

Test Plan: Tested using opensim standalone on windows with json stats.

Reviewers: rlouden

Reviewed By: rlouden

Differential Revision: http://cr.irl.ucf.edu/D275
fsassets
Steven Zielinski 2015-04-30 15:45:11 -04:00
parent 2e7ace4e25
commit 625452b84b
2 changed files with 5562 additions and 5559 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -62,6 +62,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);
#region Fields
@ -1137,7 +1139,8 @@ namespace OpenSim.Region.Framework.Scenes
// 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));
statisticsConfig.GetInt("NumberOfFrames",
m_defaultNumberFramesStored));
}
else
{

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

@ -228,7 +228,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