aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/XEngine
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2013-01-10 00:32:22 +0000
committerJustin Clark-Casey (justincc)2013-01-25 23:48:59 +0000
commit9ddddde42ec3b92393f699e4f6cace8267cda5db (patch)
tree96e76e59b555858bc50bff90946df56c8bf2b7b7 /OpenSim/Region/ScriptEngine/XEngine
parentminor: Remove unnecessary commented out code from last commit c28a2f05 and fi... (diff)
downloadopensim-SC_OLD-9ddddde42ec3b92393f699e4f6cace8267cda5db.zip
opensim-SC_OLD-9ddddde42ec3b92393f699e4f6cace8267cda5db.tar.gz
opensim-SC_OLD-9ddddde42ec3b92393f699e4f6cace8267cda5db.tar.bz2
opensim-SC_OLD-9ddddde42ec3b92393f699e4f6cace8267cda5db.tar.xz
Add "show sensors" command to show script sensor information for debug purposes.
Diffstat (limited to 'OpenSim/Region/ScriptEngine/XEngine')
-rw-r--r--OpenSim/Region/ScriptEngine/XEngine/ScriptEngineConsoleCommands.cs86
-rw-r--r--OpenSim/Region/ScriptEngine/XEngine/XEngine.cs5
2 files changed, 91 insertions, 0 deletions
diff --git a/OpenSim/Region/ScriptEngine/XEngine/ScriptEngineConsoleCommands.cs b/OpenSim/Region/ScriptEngine/XEngine/ScriptEngineConsoleCommands.cs
new file mode 100644
index 0000000..e47917d
--- /dev/null
+++ b/OpenSim/Region/ScriptEngine/XEngine/ScriptEngineConsoleCommands.cs
@@ -0,0 +1,86 @@
1/*
2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met:
7 * * Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer.
9 * * Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution.
12 * * Neither the name of the OpenSimulator Project nor the
13 * names of its contributors may be used to endorse or promote products
14 * derived from this software without specific prior written permission.
15 *
16 * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19 * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */
27
28using System;
29using System.Collections.Generic;
30using OpenSim.Framework;
31using OpenSim.Framework.Console;
32using OpenSim.Region.ScriptEngine.Interfaces;
33using OpenSim.Region.ScriptEngine.Shared.Api;
34using OpenSim.Region.ScriptEngine.Shared.Api.Plugins;
35
36namespace OpenSim.Region.ScriptEngine.XEngine
37{
38 public class ScriptEngineConsoleCommands
39 {
40 IScriptEngine m_engine;
41
42 public ScriptEngineConsoleCommands(IScriptEngine engine)
43 {
44 m_engine = engine;
45 }
46
47 public void RegisterCommands()
48 {
49 MainConsole.Instance.Commands.AddCommand(
50 "Scripts", false, "show sensors", "show sensors", "Show script sensors information",
51 HandleShowSensors);
52 }
53
54 private void HandleShowSensors(string module, string[] cmdparams)
55 {
56 if (!(MainConsole.Instance.ConsoleScene == null || MainConsole.Instance.ConsoleScene == m_engine.World))
57 return;
58
59 SensorRepeat sr = AsyncCommandManager.GetSensorRepeatPlugin(m_engine);
60
61 if (sr == null)
62 {
63 MainConsole.Instance.Output("Sensor plugin not yet initialized");
64 return;
65 }
66
67 List<SensorRepeat.SensorInfo> sensorInfo = sr.GetSensorInfo();
68
69 ConsoleDisplayTable cdt = new ConsoleDisplayTable();
70 cdt.AddColumn("Part name", 40);
71 cdt.AddColumn("Script item ID", 36);
72 cdt.AddColumn("Type", 4);
73 cdt.AddColumn("Interval", 8);
74 cdt.AddColumn("Range", 8);
75 cdt.AddColumn("Arc", 8);
76
77 foreach (SensorRepeat.SensorInfo s in sensorInfo)
78 {
79 cdt.AddRow(s.host.Name, s.itemID, s.type, s.interval, s.range, s.arc);
80 }
81
82 MainConsole.Instance.Output(cdt.ToString());
83 MainConsole.Instance.OutputFormat("Total: {0}", sensorInfo.Count);
84 }
85 }
86} \ No newline at end of file
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
index 4bbcb7c..8c3bb5b 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
@@ -169,6 +169,8 @@ namespace OpenSim.Region.ScriptEngine.XEngine
169 IWorkItemResult m_CurrentCompile = null; 169 IWorkItemResult m_CurrentCompile = null;
170 private Dictionary<UUID, int> m_CompileDict = new Dictionary<UUID, int>(); 170 private Dictionary<UUID, int> m_CompileDict = new Dictionary<UUID, int>();
171 171
172 private ScriptEngineConsoleCommands m_consoleCommands;
173
172 public string ScriptEngineName 174 public string ScriptEngineName
173 { 175 {
174 get { return "XEngine"; } 176 get { return "XEngine"; }
@@ -318,6 +320,9 @@ namespace OpenSim.Region.ScriptEngine.XEngine
318 OnObjectRemoved += m_XmlRpcRouter.ObjectRemoved; 320 OnObjectRemoved += m_XmlRpcRouter.ObjectRemoved;
319 } 321 }
320 322
323 m_consoleCommands = new ScriptEngineConsoleCommands(this);
324 m_consoleCommands.RegisterCommands();
325
321 MainConsole.Instance.Commands.AddCommand( 326 MainConsole.Instance.Commands.AddCommand(
322 "Scripts", false, "xengine status", "xengine status", "Show status information", 327 "Scripts", false, "xengine status", "xengine status", "Show status information",
323 "Show status information on the script engine.", 328 "Show status information on the script engine.",