Merge branch 'master' into careminster

Conflicts:
	OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs

OpenSim/Region/Framework/Interfaces/IEntityInventory.cs

@@ -175,6 +175,16 @@ namespace OpenSim.Region.Framework.Interfaces
         /// </returns>
         List<TaskInventoryItem> GetInventoryItems(string name);
 
+        /// <summary>
+        /// Get inventory items by type.
+        /// </summary>
+        /// <param type="name"></param>
+        /// <returns>
+        /// A list of inventory items of that type.
+        /// If no inventory items of that type then an empty list is returned.
+        /// </returns>
+        List<TaskInventoryItem> GetInventoryItems(InventoryType type);
+
         /// <summary>
         /// Get the scene object referenced by an inventory item.
         /// </summary>

OpenSim/Region/Framework/Interfaces/IScriptModule.cs

@@ -84,6 +84,14 @@ namespace OpenSim.Region.Framework.Interfaces
         /// </summary>
         void StartProcessing();
 
+        /// <summary>
+        /// Get the execution times of all scripts in the given array if they are currently running.
+        /// </summary>
+        /// <returns>
+        /// A float the value is a representative execution time in milliseconds of all scripts in that Array.
+        /// </returns>
+        float GetScriptExecutionTime(List<UUID> itemIDs);
+
         /// <summary>
         /// Get the execution times of all scripts in each object.
         /// </summary>

OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs

@@ -4031,6 +4031,45 @@ namespace OpenSim.Region.Framework.Scenes
             return count;
         }
 
+        /// <summary>
+        /// A float the value is a representative execution time in milliseconds of all scripts in the link set.
+        /// </summary>
+        public float ScriptExecutionTime()
+        {
+            IScriptModule[] engines = Scene.RequestModuleInterfaces<IScriptModule>();
+
+            if (engines.Length == 0) // No engine at all
+                return 0.0f;
+
+            float time = 0.0f;
+
+            // get all the scripts in all parts
+            SceneObjectPart[] parts = m_parts.GetArray();
+            List<TaskInventoryItem> scripts = new List<TaskInventoryItem>();
+            for (int i = 0; i < parts.Length; i++)
+            {
+                scripts.AddRange(parts[i].Inventory.GetInventoryItems(InventoryType.LSL));
+            }
+            // extract the UUIDs
+            List<UUID> ids = new List<UUID>(scripts.Count);
+            foreach (TaskInventoryItem script in scripts)
+            {
+                if (!ids.Contains(script.ItemID))
+                {
+                    ids.Add(script.ItemID);
+                }
+            }
+            // Offer the list of script UUIDs to each engine found and accumulate the time
+            foreach (IScriptModule e in engines)
+            {
+                if (e != null)
+                {
+                    time += e.GetScriptExecutionTime(ids);
+                }
+            }
+            return time;
+        }
+
         /// <summary>
         /// Returns a count of the number of running scripts in this groups parts.
         /// </summary>

OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs

@@ -267,15 +267,10 @@ namespace OpenSim.Region.Framework.Scenes
         /// </summary>
         public void CreateScriptInstances(int startParam, bool postOnRez, string engine, int stateSource)
         {
-            Items.LockItemsForRead(true);
+            List<TaskInventoryItem> scripts = GetInventoryItems(InventoryType.LSL);
-            IList<TaskInventoryItem> items = new List<TaskInventoryItem>(Items.Values);
+            foreach (TaskInventoryItem item in scripts)
-            Items.LockItemsForRead(false);
-            foreach (TaskInventoryItem item in items)
-            {
-                if ((int)InventoryType.LSL == item.InvType)
                 CreateScriptInstance(item, startParam, postOnRez, engine, stateSource);
         }
-        }
 
         public ArrayList GetScriptErrors(UUID itemID)
         {
@@ -305,19 +300,13 @@ namespace OpenSim.Region.Framework.Scenes
         /// </param>
         public void RemoveScriptInstances(bool sceneObjectBeingDeleted)
         {
-            Items.LockItemsForRead(true);
+            List<TaskInventoryItem> scripts = GetInventoryItems(InventoryType.LSL);
-            IList<TaskInventoryItem> items = new List<TaskInventoryItem>(Items.Values);
+            foreach (TaskInventoryItem item in scripts)
-            Items.LockItemsForRead(false);
-
-            foreach (TaskInventoryItem item in items)
-            {
-                if ((int)InventoryType.LSL == item.InvType)
             {
                 RemoveScriptInstance(item.ItemID, sceneObjectBeingDeleted);
                 m_part.RemoveScriptEvents(item.ItemID);
             }
         }
-        }
 
         /// <summary>
         /// Start a script which is in this prim's inventory.
@@ -1291,8 +1280,7 @@ namespace OpenSim.Region.Framework.Scenes
         public int ScriptCount()
         {
             int count = 0;
-            lock (m_items)
+            Items.LockItemsForRead(true);
-            {
             foreach (TaskInventoryItem item in m_items.Values)
             {
                 if (item.InvType == (int)InventoryType.LSL)
@@ -1300,8 +1288,7 @@ namespace OpenSim.Region.Framework.Scenes
                     count++;
                 }
             }
-            }
+            Items.LockItemsForRead(false);
-
             return count;
         }
         /// <summary>
@@ -1315,7 +1302,7 @@ namespace OpenSim.Region.Framework.Scenes
                 return 0;
 
             int count = 0;
-            List<TaskInventoryItem> scripts = GetInventoryScripts();
+            List<TaskInventoryItem> scripts = GetInventoryItems(InventoryType.LSL);
 
             foreach (TaskInventoryItem item in scripts)
             {
@@ -1347,22 +1334,24 @@ namespace OpenSim.Region.Framework.Scenes
         {
             List<TaskInventoryItem> ret = new List<TaskInventoryItem>();
 
-            lock (m_items)
+            Items.LockItemsForRead(true);
             ret = new List<TaskInventoryItem>(m_items.Values);
+            Items.LockItemsForRead(false);
 
             return ret;
         }
 
-        public List<TaskInventoryItem> GetInventoryScripts()
+        public List<TaskInventoryItem> GetInventoryItems(InventoryType type)
         {
             List<TaskInventoryItem> ret = new List<TaskInventoryItem>();
 
-            lock (m_items)
+            Items.LockItemsForRead(true);
-            {
+
             foreach (TaskInventoryItem item in m_items.Values)
-                    if (item.InvType == (int)InventoryType.LSL)
+                if (item.InvType == (int)type)
                     ret.Add(item);
-            }
+
+            Items.LockItemsForRead(false);
 
             return ret;
         }
@@ -1384,10 +1373,9 @@ namespace OpenSim.Region.Framework.Scenes
             if (engines.Length == 0) // No engine at all
                 return ret;
 
-            Items.LockItemsForRead(true);
+            List<TaskInventoryItem> scripts = GetInventoryItems(InventoryType.LSL);
-            foreach (TaskInventoryItem item in m_items.Values)
+
-            {
+            foreach (TaskInventoryItem item in scripts)
-                if (item.InvType == (int)InventoryType.LSL)
             {
                 foreach (IScriptModule e in engines)
                 {
@@ -1411,8 +1399,6 @@ namespace OpenSim.Region.Framework.Scenes
                     }
                 }
             }
-            }
-            Items.LockItemsForRead(false);
             return ret;
         }
         
@@ -1422,12 +1408,9 @@ namespace OpenSim.Region.Framework.Scenes
             if (engines.Length == 0)
                 return;
 
+            List<TaskInventoryItem> scripts = GetInventoryItems(InventoryType.LSL);
 
-            Items.LockItemsForRead(true);
+            foreach (TaskInventoryItem item in scripts)
-
-            foreach (TaskInventoryItem item in m_items.Values)
-            {
-                if (item.InvType == (int)InventoryType.LSL)
             {
                 foreach (IScriptModule engine in engines)
                 {
@@ -1441,8 +1424,5 @@ namespace OpenSim.Region.Framework.Scenes
                 }
             }
         }
-
-            Items.LockItemsForRead(false);
-        }
     }
 }

OpenSim/Region/Framework/Scenes/ScenePresence.cs

@@ -3540,6 +3540,25 @@ namespace OpenSim.Region.Framework.Scenes
             return count;
         }
 
+        /// <summary>
+        /// A float the value is a representative execution time in milliseconds of all scripts in all attachments.
+        /// </summary>
+        public float ScriptExecutionTime()
+        {
+            float time = 0.0f;
+            lock (m_attachments)
+            {
+                foreach (SceneObjectGroup gobj in m_attachments)
+                {
+                    if (gobj != null)
+                    {
+                        time += gobj.ScriptExecutionTime();
+                    }
+                }
+            }
+            return time;
+        }
+
         /// <summary>
         /// Returns the total count of running scripts in all parts.
         /// </summary>

OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs

@@ -11176,7 +11176,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                                 ret.Add(new LSL_Integer(av.RunningScriptCount() * 16384));
                                 break;
                             case ScriptBaseClass.OBJECT_SCRIPT_TIME:
-                                ret.Add(new LSL_Float(0));
+                                ret.Add(new LSL_Float(av.ScriptExecutionTime() / 1000.0f));
                                 break;
                             case ScriptBaseClass.OBJECT_PRIM_EQUIVALENCE:
                                 ret.Add(new LSL_Integer(1));
@@ -11244,9 +11244,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                                 ret.Add(new LSL_Integer(obj.ParentGroup.RunningScriptCount() * 16384));
                                 break;
                             case ScriptBaseClass.OBJECT_SCRIPT_TIME:
-                                // Average cpu time per simulator frame expended on all scripts in the object
+                                // Average cpu time in seconds per simulator frame expended on all scripts in the object
-                                // Not currently available at Object level
+                                ret.Add(new LSL_Float(obj.ParentGroup.ScriptExecutionTime() / 1000.0f));
-                                ret.Add(new LSL_Float(0));
                                 break;
                             case ScriptBaseClass.OBJECT_PRIM_EQUIVALENCE:
                                 // according to the SL wiki A prim or linkset will have prim

OpenSim/Region/ScriptEngine/XEngine/XEngine.cs

@@ -1997,19 +1997,40 @@ namespace OpenSim.Region.ScriptEngine.XEngine
                     if (!topScripts.ContainsKey(si.LocalID))
                         topScripts[si.RootLocalID] = 0;
 
-//                    long ticksElapsed = tickNow - si.MeasurementPeriodTickStart;
+                    topScripts[si.RootLocalID] += CalculateAdjustedExectionTime(si, tickNow);
-//                    float framesElapsed = ticksElapsed / (18.1818 * TimeSpan.TicksPerMillisecond);
+                }
+            }
 
-                    // Execution time of the script adjusted by it's measurement period to make scripts started at
+            return topScripts;
-                    // different times comparable.
+        }
-//                    float adjustedExecutionTime
-//                        = (float)si.MeasurementPeriodExecutionTime
-//                            / ((float)(tickNow - si.MeasurementPeriodTickStart) / ScriptInstance.MaxMeasurementPeriod)
-//                            / TimeSpan.TicksPerMillisecond;
 
+        public float GetScriptExecutionTime(List<UUID> itemIDs)
+        {
+            if (itemIDs == null|| itemIDs.Count == 0)
+            {
+                return 0.0f;
+            }
+            float time = 0.0f;
+            long tickNow = Util.EnvironmentTickCount();
+            IScriptInstance si;
+            // Calculate the time for all scripts that this engine is executing
+            // Ignore any others
+            foreach (UUID id in itemIDs)
+            {
+                si = GetInstance(id);
+                if (si != null && si.Running)
+                {
+                    time += CalculateAdjustedExectionTime(si, tickNow);
+                }
+            }
+            return time;
+        }
+
+        private float CalculateAdjustedExectionTime(IScriptInstance si, long tickNow)
+        {
             long ticksElapsed = tickNow - si.MeasurementPeriodTickStart;
 
-                    // Avoid divide by zerp
+            // Avoid divide by zero
             if (ticksElapsed == 0)
                 ticksElapsed = 1;
 
@@ -2028,14 +2049,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
             // 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
+            return ((float)si.MeasurementPeriodExecutionTime / ticksElapsed) * 18.1818f;
-                        = ((float)si.MeasurementPeriodExecutionTime / ticksElapsed) * 18.1818f;
-
-                    topScripts[si.RootLocalID] += adjustedExecutionTime;
-                }
-            }
-
-            return topScripts;
         }
 
         public void SuspendScript(UUID itemID)

bin/config-include/FlotsamCache.ini.example

@@ -36,7 +36,7 @@
 
     ; How often {in hours} should the disk be checked for expired filed
     ; Specify 0 to disable expiration checking
-    FileCleanupTimer = .166  ;roughly every 10 minutes
+    FileCleanupTimer = 1.0  ;every hour
 
     ; If WAIT_ON_INPROGRESS_REQUESTS has been defined then this specifies how
     ; long (in miliseconds) to block a request thread while trying to complete
@@ -60,4 +60,4 @@
     ; cache, and request all assets that are found that are not already cached (this
     ; will cause those assets to be cached)
     ;
-    ; DeepScanBeforePurge = false
+    DeepScanBeforePurge = true