diff options
author | Justin Clark-Casey (justincc) | 2012-03-16 01:31:53 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2012-03-16 01:31:53 +0000 |
commit | c386b68373d0f4c46811423a2ba9ffbb486a1d9f (patch) | |
tree | aa2071710d83184ebcb7b19073355ab060fc58a1 /OpenSim/Region/ScriptEngine/XEngine | |
parent | Fix owner name display in "Top Colliders" and "Top Script" region reports. (diff) | |
download | opensim-SC_OLD-c386b68373d0f4c46811423a2ba9ffbb486a1d9f.zip opensim-SC_OLD-c386b68373d0f4c46811423a2ba9ffbb486a1d9f.tar.gz opensim-SC_OLD-c386b68373d0f4c46811423a2ba9ffbb486a1d9f.tar.bz2 opensim-SC_OLD-c386b68373d0f4c46811423a2ba9ffbb486a1d9f.tar.xz |
Aggregate script execution times by linksets rather than individual prims.
This is for the top scripts report.
Diffstat (limited to 'OpenSim/Region/ScriptEngine/XEngine')
-rw-r--r-- | OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs index bddb1b9..3697f78 100644 --- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs +++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | |||
@@ -1083,7 +1083,6 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
1083 | 1083 | ||
1084 | if (!m_PrimObjects[localID].Contains(itemID)) | 1084 | if (!m_PrimObjects[localID].Contains(itemID)) |
1085 | m_PrimObjects[localID].Add(itemID); | 1085 | m_PrimObjects[localID].Add(itemID); |
1086 | |||
1087 | } | 1086 | } |
1088 | 1087 | ||
1089 | if (!m_Assemblies.ContainsKey(assetID)) | 1088 | if (!m_Assemblies.ContainsKey(assetID)) |
@@ -1901,7 +1900,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
1901 | foreach (IScriptInstance si in m_Scripts.Values) | 1900 | foreach (IScriptInstance si in m_Scripts.Values) |
1902 | { | 1901 | { |
1903 | if (!topScripts.ContainsKey(si.LocalID)) | 1902 | if (!topScripts.ContainsKey(si.LocalID)) |
1904 | topScripts[si.LocalID] = 0; | 1903 | topScripts[si.RootLocalID] = 0; |
1905 | 1904 | ||
1906 | // long ticksElapsed = tickNow - si.MeasurementPeriodTickStart; | 1905 | // long ticksElapsed = tickNow - si.MeasurementPeriodTickStart; |
1907 | // float framesElapsed = ticksElapsed / (18.1818 * TimeSpan.TicksPerMillisecond); | 1906 | // float framesElapsed = ticksElapsed / (18.1818 * TimeSpan.TicksPerMillisecond); |
@@ -1937,7 +1936,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
1937 | float adjustedExecutionTime | 1936 | float adjustedExecutionTime |
1938 | = ((float)si.MeasurementPeriodExecutionTime / ticksElapsed) * 18.1818f; | 1937 | = ((float)si.MeasurementPeriodExecutionTime / ticksElapsed) * 18.1818f; |
1939 | 1938 | ||
1940 | topScripts[si.LocalID] += adjustedExecutionTime; | 1939 | topScripts[si.RootLocalID] += adjustedExecutionTime; |
1941 | } | 1940 | } |
1942 | } | 1941 | } |
1943 | 1942 | ||