Revert "Merge master into teravuswork", it should have been avination, not master.

This reverts commit dfac269032300872c4d0dc507f4f9062d102b0f4, reversing
changes made to 619c39e5144f15aca129d6d999bcc5c34133ee64.

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
             = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
 
         public const string LastReportedObjectUpdateStatName = "LastReportedObjectUpdates";
-        public const string SlowFramesStatName = "SlowFrames";
 
         public delegate void SendStatResult(SimStats stats);
 
@@ -130,16 +129,6 @@ namespace OpenSim.Region.Framework.Scenes
         }
 
         /// <summary>
-        /// Number of frames that have taken longer to process than Scene.MIN_FRAME_TIME
-        /// </summary>
-        public Stat SlowFramesStat { get; private set; }
-
-        /// <summary>
-        /// The threshold at which we log a slow frame.
-        /// </summary>
-        public int SlowFramesStatReportThreshold { get; private set; }
-
-        /// <summary>
         /// Extra sim statistics that are used by monitors but not sent to the client.
         /// </summary>
         /// <value>
@@ -237,24 +226,6 @@ 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",
-                    "Number of frames where frame time has been significantly longer than the desired frame time.",
-                    " frames",
-                    "scene",
-                    m_scene.Name,
-                    StatType.Push,
-                    null,
-                    StatVerbosity.Info);
-
-            StatsManager.RegisterStat(SlowFramesStat);
         }
 
         public void Close()
@@ -472,7 +443,6 @@ namespace OpenSim.Region.Framework.Scenes
                     lock (m_lastReportedExtraSimStats)
                     {
                         m_lastReportedExtraSimStats[LastReportedObjectUpdateStatName] = m_objectUpdates / m_statsUpdateFactor;
-                        m_lastReportedExtraSimStats[SlowFramesStat.ShortName] = (float)SlowFramesStat.Value;
 
                         Dictionary<string, float> physicsStats = m_scene.PhysicsScene.GetStats();
         
@@ -593,11 +563,6 @@ 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 addNetMS(int ms)