ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-05-16 03:36:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Report "Script Execution Time" as the time spent executing the script in the last 30 seconds. Use a sliding window to calculate this.

Browse Source 
Notes:
- This metric provides a better indication of which scripts are taking up a lot of CPU (and therefore should be optimized).
- Previously the execution time was reset to 0 in every new measurement period, causing the reported time to fluctuate for no reason. This has been fixed by using a sliding window.
This commit is contained in:
Oren Hurvitz
2015-07-27 12:16:21 +03:00
parent 287096d826
commit a3bed1fbcb
4 changed files with 241 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
View File

@@ -199,11 +199,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
public DateTime TimeStarted { get; private set; }
public long MeasurementPeriodTickStart { get; private set; }
public MetricsCollectorTime ExecutionTime { get; private set; }
public long MeasurementPeriodExecutionTime { get; private set; }
public static readonly int MaxMeasurementPeriod = 30 * 1000; // show the *recent* time used by the script, to find currently active scripts
private static readonly int MeasurementWindow = 30 * 1000; // show the *recent* time used by the script, to find currently active scripts
private bool m_coopTermination;
@@ -246,6 +244,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
m_SaveState = StatePersistedHere;
ExecutionTime = new MetricsCollectorTime(MeasurementWindow, 10);
// m_log.DebugFormat(
// "[SCRIPT INSTANCE]: Instantiated script instance {0} (id {1}) in part {2} (id {3}) in object {4} attached avatar {5} in {6}",
// ScriptTask.Name, ScriptTask.ItemID, Part.Name, Part.UUID, Part.ParentGroup.Name, m_AttachedAvatar, Engine.World.Name);
@@ -505,8 +505,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
Running = true;
TimeStarted = DateTime.Now;
MeasurementPeriodTickStart = Util.EnvironmentTickCount();
MeasurementPeriodExecutionTime = 0;
// Note: we don't reset ExecutionTime. The reason is that runaway scripts are stopped and restarted
// automatically, and we *do* want to show that they had high CPU in that case. If we had reset
// ExecutionTime here then runaway scripts, paradoxically, would never show up in the "Top Scripts" dialog.
if (EventQueue.Count > 0)
{
@@ -832,20 +834,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
m_EventStart = DateTime.Now;
m_InEvent = true;
// Reset the measurement period when we reach the end of the current one.
if (Util.EnvironmentTickCountSubtract((int)MeasurementPeriodTickStart) > MaxMeasurementPeriod)
{
MeasurementPeriodTickStart = Util.EnvironmentTickCount();
MeasurementPeriodExecutionTime = 0;
}
Stopwatch timer = new Stopwatch();
timer.Start();
Stopwatch executionTime = new Stopwatch();
executionTime.Start();
m_Script.ExecuteEvent(State, data.EventName, data.Params);
executionTime.Stop();
MeasurementPeriodExecutionTime += executionTime.ElapsedMilliseconds;
timer.Stop();
ExecutionTime.AddSample(timer);
m_InEvent = false;
m_CurrentEvent = String.Empty;