diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Interfaces/IScriptInstance.cs | 5 | ||||
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs | 9 | ||||
-rw-r--r-- | OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | 5 |
3 files changed, 15 insertions, 4 deletions
diff --git a/OpenSim/Region/ScriptEngine/Interfaces/IScriptInstance.cs b/OpenSim/Region/ScriptEngine/Interfaces/IScriptInstance.cs index f3abd96..0cef550 100644 --- a/OpenSim/Region/ScriptEngine/Interfaces/IScriptInstance.cs +++ b/OpenSim/Region/ScriptEngine/Interfaces/IScriptInstance.cs | |||
@@ -115,6 +115,11 @@ namespace OpenSim.Region.ScriptEngine.Interfaces | |||
115 | Queue EventQueue { get; } | 115 | Queue EventQueue { get; } |
116 | 116 | ||
117 | /// <summary> | 117 | /// <summary> |
118 | /// Number of events queued for processing. | ||
119 | /// </summary> | ||
120 | long EventsQueued { get; } | ||
121 | |||
122 | /// <summary> | ||
118 | /// Number of events processed by this script instance. | 123 | /// Number of events processed by this script instance. |
119 | /// </summary> | 124 | /// </summary> |
120 | long EventsProcessed { get; } | 125 | long EventsProcessed { get; } |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs index 5bfe97a..8e81e9f 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs | |||
@@ -173,6 +173,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance | |||
173 | 173 | ||
174 | public Queue EventQueue { get; private set; } | 174 | public Queue EventQueue { get; private set; } |
175 | 175 | ||
176 | public long EventsQueued | ||
177 | { | ||
178 | get | ||
179 | { | ||
180 | lock (EventQueue) | ||
181 | return EventQueue.Count; | ||
182 | } | ||
183 | } | ||
184 | |||
176 | public long EventsProcessed { get; private set; } | 185 | public long EventsProcessed { get; private set; } |
177 | 186 | ||
178 | public int StartParam { get; set; } | 187 | public int StartParam { get; set; } |
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs index 394826e..aeb807c 100644 --- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs +++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | |||
@@ -526,10 +526,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
526 | 526 | ||
527 | sb.AppendFormat("Script name : {0}\n", instance.ScriptName); | 527 | sb.AppendFormat("Script name : {0}\n", instance.ScriptName); |
528 | sb.AppendFormat("Status : {0}\n", status); | 528 | sb.AppendFormat("Status : {0}\n", status); |
529 | 529 | sb.AppendFormat("Queued events : {0}\n", instance.EventsQueued); | |
530 | lock (eq) | ||
531 | sb.AppendFormat("Queued events : {0}\n", eq.Count); | ||
532 | |||
533 | sb.AppendFormat("Processed events : {0}\n", instance.EventsProcessed); | 530 | sb.AppendFormat("Processed events : {0}\n", instance.EventsProcessed); |
534 | sb.AppendFormat("Item UUID : {0}\n", instance.ItemID); | 531 | sb.AppendFormat("Item UUID : {0}\n", instance.ItemID); |
535 | sb.AppendFormat("Containing part name: {0}\n", instance.PrimName); | 532 | sb.AppendFormat("Containing part name: {0}\n", instance.PrimName); |