From e717398f6c72bdb30e59468462f3a5f589c1bb35 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 4 Oct 2012 00:32:42 +0100
Subject: Add experimental "slow frames" stat, available in "show stats" and
via the monitoring module.
This increments a SlowFrames counter if a frame takes over 120% of maximum time.
This commit also introduces a generic OpenSim.Framework.Monitoring.Stat which is available to any code that wants to register a statistic.
This is more granualar than asking objects to create their own reports.
At some point this will supersede earlier IMonitor and IAlert facilities in MonitoringModule which are only available to scene code.
---
.../Region/Framework/Scenes/SimStatsReporter.cs | 33 ++++++++++++++++++++++
1 file changed, 33 insertions(+)
(limited to 'OpenSim/Region/Framework/Scenes/SimStatsReporter.cs')
diff --git a/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs b/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
index 96317c3..b7b5ea2 100644
--- a/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
+++ b/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
@@ -47,6 +47,7 @@ namespace OpenSim.Region.Framework.Scenes
= log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
public const string LastReportedObjectUpdateStatName = "LastReportedObjectUpdates";
+ public const string SlowFramesStatName = "SlowFrames";
public delegate void SendStatResult(SimStats stats);
@@ -129,6 +130,16 @@ namespace OpenSim.Region.Framework.Scenes
}
///
+ /// Number of frames that have taken longer to process than Scene.MIN_FRAME_TIME
+ ///
+ public Stat SlowFramesStat { get; private set; }
+
+ ///
+ /// The threshold at which we log a slow frame.
+ ///
+ public int SlowFramesStatReportThreshold { get; private set; }
+
+ ///
/// Extra sim statistics that are used by monitors but not sent to the client.
///
///
@@ -225,6 +236,22 @@ namespace OpenSim.Region.Framework.Scenes
if (StatsManager.SimExtraStats != null)
OnSendStatsResult += StatsManager.SimExtraStats.ReceiveClassicSimStatsPacket;
+
+ /// At the moment, we'll only report if a frame is over 120% of target, since commonly frames are a bit
+ /// longer than ideal (which in itself is a concern).
+ SlowFramesStatReportThreshold = (int)Math.Ceiling(m_scene.MinFrameTime * 1000 * 1.2);
+
+ SlowFramesStat
+ = new Stat(
+ "SlowFrames",
+ "Slow Frames",
+ "frames",
+ "scene",
+ m_scene.Name,
+ StatVerbosity.Info,
+ "Number of frames where frame time has been significantly longer than the desired frame time.");
+
+ StatsManager.RegisterStat(SlowFramesStat);
}
public void Close()
@@ -418,6 +445,7 @@ namespace OpenSim.Region.Framework.Scenes
lock (m_lastReportedExtraSimStats)
{
m_lastReportedExtraSimStats[LastReportedObjectUpdateStatName] = m_objectUpdates / m_statsUpdateFactor;
+ m_lastReportedExtraSimStats[SlowFramesStat.ShortName] = (float)SlowFramesStat.Value;
Dictionary physicsStats = m_scene.PhysicsScene.GetStats();
@@ -535,6 +563,11 @@ namespace OpenSim.Region.Framework.Scenes
public void addFrameMS(int ms)
{
m_frameMS += ms;
+
+ // At the moment, we'll only report if a frame is over 120% of target, since commonly frames are a bit
+ // longer than ideal due to the inaccuracy of the Sleep in Scene.Update() (which in itself is a concern).
+ if (ms > SlowFramesStatReportThreshold)
+ SlowFramesStat.Value++;
}
public void AddSpareMS(int ms)
--
cgit v1.1
From 3d36a6d55cb0bba408f5447d4596c12564366030 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 4 Oct 2012 01:27:40 +0100
Subject: Add generic PercentageStat.
Not yet used.
---
OpenSim/Region/Framework/Scenes/SimStatsReporter.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'OpenSim/Region/Framework/Scenes/SimStatsReporter.cs')
diff --git a/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs b/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
index b7b5ea2..2addb5b 100644
--- a/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
+++ b/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
@@ -245,7 +245,7 @@ namespace OpenSim.Region.Framework.Scenes
= new Stat(
"SlowFrames",
"Slow Frames",
- "frames",
+ " frames",
"scene",
m_scene.Name,
StatVerbosity.Info,
--
cgit v1.1
From 4578ff74fec7500902f58fbdee6ce5a6b39601fb Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 23 Oct 2012 01:50:05 +0100
Subject: Add object count stats for new IncomingPacket and UDPPacketBuffer
pools if they are enabled. Add count stats for existing LLUDP pool.
This introduces a pull stat type in addition to the push stat type.
A pull stat takes a method on construction which knows how to update the stat on request.
In this way, special interfaces for pull stat collection are not necessary.
---
OpenSim/Region/Framework/Scenes/SimStatsReporter.cs | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
(limited to 'OpenSim/Region/Framework/Scenes/SimStatsReporter.cs')
diff --git a/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs b/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
index 2addb5b..b9d615e 100644
--- a/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
+++ b/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
@@ -245,11 +245,13 @@ namespace OpenSim.Region.Framework.Scenes
= new Stat(
"SlowFrames",
"Slow Frames",
+ "Number of frames where frame time has been significantly longer than the desired frame time.",
" frames",
"scene",
m_scene.Name,
- StatVerbosity.Info,
- "Number of frames where frame time has been significantly longer than the desired frame time.");
+ StatType.Push,
+ null,
+ StatVerbosity.Info);
StatsManager.RegisterStat(SlowFramesStat);
}
--
cgit v1.1