diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SimStatsReporter.cs | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs b/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs index 5398ab9..756b1f4 100644 --- a/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs +++ b/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs | |||
@@ -47,7 +47,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
47 | = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); | 47 | = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); |
48 | 48 | ||
49 | public const string LastReportedObjectUpdateStatName = "LastReportedObjectUpdates"; | 49 | public const string LastReportedObjectUpdateStatName = "LastReportedObjectUpdates"; |
50 | public const string SlowFramesStatName = "SlowFrames"; | ||
51 | 50 | ||
52 | public delegate void SendStatResult(SimStats stats); | 51 | public delegate void SendStatResult(SimStats stats); |
53 | 52 | ||
@@ -130,16 +129,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
130 | } | 129 | } |
131 | 130 | ||
132 | /// <summary> | 131 | /// <summary> |
133 | /// Number of frames that have taken longer to process than Scene.MIN_FRAME_TIME | ||
134 | /// </summary> | ||
135 | public Stat SlowFramesStat { get; private set; } | ||
136 | |||
137 | /// <summary> | ||
138 | /// The threshold at which we log a slow frame. | ||
139 | /// </summary> | ||
140 | public int SlowFramesStatReportThreshold { get; private set; } | ||
141 | |||
142 | /// <summary> | ||
143 | /// Extra sim statistics that are used by monitors but not sent to the client. | 132 | /// Extra sim statistics that are used by monitors but not sent to the client. |
144 | /// </summary> | 133 | /// </summary> |
145 | /// <value> | 134 | /// <value> |
@@ -237,24 +226,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
237 | 226 | ||
238 | if (StatsManager.SimExtraStats != null) | 227 | if (StatsManager.SimExtraStats != null) |
239 | OnSendStatsResult += StatsManager.SimExtraStats.ReceiveClassicSimStatsPacket; | 228 | OnSendStatsResult += StatsManager.SimExtraStats.ReceiveClassicSimStatsPacket; |
240 | |||
241 | /// At the moment, we'll only report if a frame is over 120% of target, since commonly frames are a bit | ||
242 | /// longer than ideal (which in itself is a concern). | ||
243 | SlowFramesStatReportThreshold = (int)Math.Ceiling(m_scene.MinFrameTime * 1000 * 1.2); | ||
244 | |||
245 | SlowFramesStat | ||
246 | = new Stat( | ||
247 | "SlowFrames", | ||
248 | "Slow Frames", | ||
249 | "Number of frames where frame time has been significantly longer than the desired frame time.", | ||
250 | " frames", | ||
251 | "scene", | ||
252 | m_scene.Name, | ||
253 | StatType.Push, | ||
254 | null, | ||
255 | StatVerbosity.Info); | ||
256 | |||
257 | StatsManager.RegisterStat(SlowFramesStat); | ||
258 | } | 229 | } |
259 | 230 | ||
260 | public void Close() | 231 | public void Close() |
@@ -472,7 +443,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
472 | lock (m_lastReportedExtraSimStats) | 443 | lock (m_lastReportedExtraSimStats) |
473 | { | 444 | { |
474 | m_lastReportedExtraSimStats[LastReportedObjectUpdateStatName] = m_objectUpdates / m_statsUpdateFactor; | 445 | m_lastReportedExtraSimStats[LastReportedObjectUpdateStatName] = m_objectUpdates / m_statsUpdateFactor; |
475 | m_lastReportedExtraSimStats[SlowFramesStat.ShortName] = (float)SlowFramesStat.Value; | ||
476 | 446 | ||
477 | Dictionary<string, float> physicsStats = m_scene.PhysicsScene.GetStats(); | 447 | Dictionary<string, float> physicsStats = m_scene.PhysicsScene.GetStats(); |
478 | 448 | ||
@@ -593,11 +563,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
593 | public void addFrameMS(int ms) | 563 | public void addFrameMS(int ms) |
594 | { | 564 | { |
595 | m_frameMS += ms; | 565 | m_frameMS += ms; |
596 | |||
597 | // At the moment, we'll only report if a frame is over 120% of target, since commonly frames are a bit | ||
598 | // longer than ideal due to the inaccuracy of the Sleep in Scene.Update() (which in itself is a concern). | ||
599 | if (ms > SlowFramesStatReportThreshold) | ||
600 | SlowFramesStat.Value++; | ||
601 | } | 566 | } |
602 | 567 | ||
603 | public void addNetMS(int ms) | 568 | public void addNetMS(int ms) |