Replace script-lines-per-second with the script execution time scaled by its measurement period and an idealised frame time.

The previous lines-per-second measurement used for top scripts report was inaccurate, since lines executed does not reflect time taken to execute.
Also, every fetch of the report would reset all the numbers limiting its usefulness and we weren't even guaranteed to see the top 100.
The actual measurement value should be script execution time per frame but XEngine does not work this way.
Therefore, we use actual script execution time scaled by the measurement period and an idealised frame time.
This is still not ideal but gives reasonable results and allows scripts to be compared.
This commit moves script execution time calculations from SceneGraph into IScriptModule implementations.

3 files changed, 88 insertions, 1 deletions

diff --git a/OpenSim/Region/ScriptEngine/Interfaces/IScriptInstance.cs b/OpenSim/Region/ScriptEngine/Interfaces/IScriptInstance.cs
index 8762642..11f54a2 100644
--- a/OpenSim/Region/ScriptEngine/Interfaces/IScriptInstance.cs
+++ b/OpenSim/Region/ScriptEngine/Interfaces/IScriptInstance.cs
@@ -78,6 +78,21 @@ namespace OpenSim.Region.ScriptEngine.Interfaces
         /// </summary>
         string State { get; set; }
 
+        /// <summary>
+        /// Time the script was last started
+        /// </summary>
+        DateTime TimeStarted { get; }
+
+        /// <summary>
+        /// Tick the last measurement period was started.
+        /// </summary>
+        long MeasurementPeriodTickStart { get; }
+
+        /// <summary>
+        /// Ticks spent executing in the last measurement period.
+        /// </summary>
+        long MeasurementPeriodExecutionTime { get; }
+
         IScriptEngine Engine { get; }
         UUID AppDomain { get; set; }
         string PrimName { get; }
diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
index 968351b..b177287 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
@@ -172,6 +172,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
 
         public TaskInventoryItem ScriptTask { get; private set; }
 
+        public DateTime TimeStarted { get; private set; }
+
+        public long MeasurementPeriodTickStart { get; private set; }
+
+        public long MeasurementPeriodExecutionTime { get; private set; }
+
+        public static readonly long MaxMeasurementPeriod = 30 * TimeSpan.TicksPerMinute;
+
         public void ClearQueue()
         {
             m_TimerQueued = false;
@@ -458,6 +466,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
 
                 Running = true;
 
+                TimeStarted = DateTime.Now;
+                MeasurementPeriodTickStart = Util.EnvironmentTickCount();
+                MeasurementPeriodExecutionTime = 0;
+
                 if (EventQueue.Count > 0)
                 {
                     if (m_CurrentWorkItem == null)
@@ -710,8 +722,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
                             m_EventStart = DateTime.Now;
                             m_InEvent = true;
 
+                            int start = Util.EnvironmentTickCount();
+
+                            // Reset the measurement period when we reach the end of the current one.
+                            if (start - MeasurementPeriodTickStart > MaxMeasurementPeriod)
+                                MeasurementPeriodTickStart = start;
+
                             m_Script.ExecuteEvent(State, data.EventName, data.Params);
 
+                            MeasurementPeriodExecutionTime += Util.EnvironmentTickCount() - start;
+
                             m_InEvent = false;
                             m_CurrentEvent = String.Empty;
 
@@ -720,7 +740,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
                                 // This will be the very first event we deliver
                                 // (state_entry) in default state
                                 //
-
                                 SaveState(m_Assembly);
 
                                 m_SaveState = false;
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
index 105d97d..bddb1b9 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
@@ -1891,6 +1891,59 @@ namespace OpenSim.Region.ScriptEngine.XEngine
             }
         }
 
+        public Dictionary<uint, float> GetObjectScriptsExecutionTimes()
+        {
+            long tickNow = Util.EnvironmentTickCount();
+            Dictionary<uint, float> topScripts = new Dictionary<uint, float>();
+
+            lock (m_Scripts)
+            {
+                foreach (IScriptInstance si in m_Scripts.Values)
+                {
+                    if (!topScripts.ContainsKey(si.LocalID))
+                        topScripts[si.LocalID] = 0;
+
+//                    long ticksElapsed = tickNow - si.MeasurementPeriodTickStart;
+//                    float framesElapsed = ticksElapsed / (18.1818 * TimeSpan.TicksPerMillisecond);
+
+                    // Execution time of the script adjusted by it's measurement period to make scripts started at
+                    // different times comparable.
+//                    float adjustedExecutionTime
+//                        = (float)si.MeasurementPeriodExecutionTime
+//                            / ((float)(tickNow - si.MeasurementPeriodTickStart) / ScriptInstance.MaxMeasurementPeriod)
+//                            / TimeSpan.TicksPerMillisecond;
+
+                    long ticksElapsed = tickNow - si.MeasurementPeriodTickStart;
+
+                    // Avoid divide by zerp
+                    if (ticksElapsed == 0)
+                        ticksElapsed = 1;
+
+                    // Scale execution time to the ideal 55 fps frame time for these reasons.
+                    //
+                    // 1) XEngine does not execute scripts per frame, unlike other script engines.  Hence, there is no
+                    // 'script execution time per frame', which is the original purpose of this value.
+                    //
+                    // 2) Giving the raw execution times is misleading since scripts start at different times, making
+                    // it impossible to compare scripts.
+                    //
+                    // 3) Scaling the raw execution time to the time that the script has been running is better but
+                    // is still misleading since a script that has just been rezzed may appear to have been running
+                    // for much longer.
+                    //
+                    // 4) Hence, we scale execution time to an idealised frame time (55 fps).  This is also not perfect
+                    // since the figure does not represent actual execution time and very hard running scripts will
+                    // never exceed 18ms (though this is a very high number for script execution so is a warning sign).
+                    float adjustedExecutionTime
+                        = ((float)si.MeasurementPeriodExecutionTime / ticksElapsed) * 18.1818f;
+
+                    topScripts[si.LocalID] += adjustedExecutionTime;
+                }
+            }
+
+            return topScripts;
+        }
+
         public void SuspendScript(UUID itemID)
         {
 //            m_log.DebugFormat("[XEngine]: Received request to suspend script with ID {0}", itemID);