From a4b01ef38a735ffe70b402061871a9c99f2757ed Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 16 Mar 2012 00:34:30 +0000
Subject: 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.
---
 .../ScriptEngine/Shared/Instance/ScriptInstance.cs  | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

(limited to 'OpenSim/Region/ScriptEngine/Shared/Instance')

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;
-- 
cgit v1.1


From c386b68373d0f4c46811423a2ba9ffbb486a1d9f Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 16 Mar 2012 01:31:53 +0000
Subject: Aggregate script execution times by linksets rather than individual
 prims.

This is for the top scripts report.
---
 OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'OpenSim/Region/ScriptEngine/Shared/Instance')

diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
index b177287..6e36742 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
@@ -164,6 +164,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
 
         public uint LocalID { get; private set; }
 
+        public UUID RootObjectID { get; private set; }
+
+        public uint RootLocalID { get; private set; }
+
         public UUID AssetID { get; private set; }
 
         public Queue EventQueue { get; private set; }
@@ -198,6 +202,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
             Engine = engine;
             LocalID = part.LocalId;
             ObjectID = part.UUID;
+            RootLocalID = part.ParentGroup.LocalId;
+            RootObjectID = part.ParentGroup.UUID;
             ItemID = itemID;
             AssetID = assetID;
             PrimName = primName;
-- 
cgit v1.1