From c803e0cca1ef1e81bec4dcd615aea955f3756b19 Mon Sep 17 00:00:00 2001 From: Teravus Ovares Date: Thu, 1 May 2008 16:39:02 +0000 Subject: * Deletes my EventReader ScriptRewriter. It isn't required to rewrite the script to publish the events anymore. * Introduces a language(regex) independent event recognizer and publishes the events the script listens. --- OpenSim/Region/ScriptEngine/Common/Executor.cs | 39 ++++++++ OpenSim/Region/ScriptEngine/Common/ExecutorBase.cs | 101 ++++++++++++++++++++- .../ScriptEngine/Common/LSL_BuiltIn_Commands.cs | 3 +- .../Common/ScriptEngineBase/ScriptManager.cs | 23 +++++ 4 files changed, 161 insertions(+), 5 deletions(-) (limited to 'OpenSim/Region/ScriptEngine/Common') diff --git a/OpenSim/Region/ScriptEngine/Common/Executor.cs b/OpenSim/Region/ScriptEngine/Common/Executor.cs index 8e0d6f1..56baa66 100644 --- a/OpenSim/Region/ScriptEngine/Common/Executor.cs +++ b/OpenSim/Region/ScriptEngine/Common/Executor.cs @@ -35,9 +35,48 @@ namespace OpenSim.Region.ScriptEngine.Common { // Cache functions by keeping a reference to them in a dictionary private Dictionary Events = new Dictionary(); + private Dictionary m_stateEvents = new Dictionary(); public Executor(IScript script) : base(script) { + initEventFlags(); + } + + + protected override scriptEvents DoGetStateEventFlags() + { + // Console.WriteLine("Get event flags for " + m_Script.State); + + // Check to see if we've already computed the flags for this state + scriptEvents eventFlags = scriptEvents.None; + if (m_stateEvents.ContainsKey(m_Script.State)) + { + m_stateEvents.TryGetValue(m_Script.State, out eventFlags); + return eventFlags; + } + + // Fill in the events for this state, cache the results in the map + foreach (KeyValuePair kvp in m_eventFlagsMap) + { + string evname = m_Script.State + "_event_" + kvp.Key; + Type type = m_Script.GetType(); + try + { + MethodInfo mi = type.GetMethod(evname); + if (mi != null) + { + // Console.WriteLine("Found handler for " + kvp.Key); + eventFlags |= kvp.Value; + } + } + catch + { + } + } + + // Save the flags we just computed and return the result + m_stateEvents.Add(m_Script.State, eventFlags); + return (eventFlags); } protected override void DoExecuteEvent(string FunctionName, object[] args) diff --git a/OpenSim/Region/ScriptEngine/Common/ExecutorBase.cs b/OpenSim/Region/ScriptEngine/Common/ExecutorBase.cs index 19fb487..2e35b46 100644 --- a/OpenSim/Region/ScriptEngine/Common/ExecutorBase.cs +++ b/OpenSim/Region/ScriptEngine/Common/ExecutorBase.cs @@ -26,6 +26,7 @@ */ using System; +using System.Collections.Generic; using System.Runtime.Remoting.Lifetime; namespace OpenSim.Region.ScriptEngine.Common @@ -54,10 +55,46 @@ namespace OpenSim.Region.ScriptEngine.Common public bool Running { get { return m_Running; } - set { - if(!m_Disable) - m_Running = value; - } + set + { + if (!m_Disable) + m_Running = value; + } + } + + protected Dictionary m_eventFlagsMap = new Dictionary(); + + [Flags] + public enum scriptEvents : int + { + None = 0, + attach = 1, + collision = 15, + collision_end = 32, + collision_start = 64, + control = 128, + dataserver = 256, + email = 512, + http_response = 1024, + land_collision = 2048, + land_collision_end = 4096, + land_collision_start = 8192, + at_target = 16384, + listen = 32768, + money = 65536, + moving_end = 131072, + moving_start = 262144, + not_at_rot_target = 524288, + not_at_target = 1048576, + remote_data = 8388608, + run_time_permissions = 268435456, + state_entry = 1073741824, + state_exit = 2, + timer = 4, + touch = 8, + touch_end = 536870912, + touch_start = 2097152, + object_rez = 4194304 } /// @@ -67,6 +104,7 @@ namespace OpenSim.Region.ScriptEngine.Common public ExecutorBase(IScript Script) { m_Script = Script; + initEventFlags(); } /// @@ -111,9 +149,21 @@ namespace OpenSim.Region.ScriptEngine.Common } DoExecuteEvent(FunctionName, args); } + protected abstract void DoExecuteEvent(string FunctionName, object[] args); /// + /// Compute the events handled by the current state of the script + /// + /// state mask + public scriptEvents GetStateEventFlags() + { + return DoGetStateEventFlags(); + } + + protected abstract scriptEvents DoGetStateEventFlags(); + + /// /// Stop script from running. Event execution will be ignored. /// public void StopScript() @@ -121,5 +171,48 @@ namespace OpenSim.Region.ScriptEngine.Common m_Running = false; m_Disable = true; } + + protected void initEventFlags() + { + // Initialize the table if it hasn't already been done + if (m_eventFlagsMap.Count > 0) + { + return; + } + + m_eventFlagsMap.Add("attach", scriptEvents.attach); + // m_eventFlagsMap.Add("at_rot_target",(long)scriptEvents.at_rot_target); + m_eventFlagsMap.Add("at_target", scriptEvents.at_target); + // m_eventFlagsMap.Add("changed",(long)scriptEvents.changed); + m_eventFlagsMap.Add("collision", scriptEvents.collision); + m_eventFlagsMap.Add("collision_end", scriptEvents.collision_end); + m_eventFlagsMap.Add("collision_start", scriptEvents.collision_start); + m_eventFlagsMap.Add("control", scriptEvents.control); + m_eventFlagsMap.Add("dataserver", scriptEvents.dataserver); + m_eventFlagsMap.Add("email", scriptEvents.email); + m_eventFlagsMap.Add("http_response", scriptEvents.http_response); + m_eventFlagsMap.Add("land_collision", scriptEvents.land_collision); + m_eventFlagsMap.Add("land_collision_end", scriptEvents.land_collision_end); + m_eventFlagsMap.Add("land_collision_start", scriptEvents.land_collision_start); + // m_eventFlagsMap.Add("link_message",scriptEvents.link_message); + m_eventFlagsMap.Add("listen", scriptEvents.listen); + m_eventFlagsMap.Add("money", scriptEvents.money); + m_eventFlagsMap.Add("moving_end", scriptEvents.moving_end); + m_eventFlagsMap.Add("moving_start", scriptEvents.moving_start); + m_eventFlagsMap.Add("not_at_rot_target", scriptEvents.not_at_rot_target); + m_eventFlagsMap.Add("not_at_target", scriptEvents.not_at_target); + // m_eventFlagsMap.Add("no_sensor",(long)scriptEvents.no_sensor); + // m_eventFlagsMap.Add("on_rez",(long)scriptEvents.on_rez); + m_eventFlagsMap.Add("remote_data", scriptEvents.remote_data); + m_eventFlagsMap.Add("run_time_permissions", scriptEvents.run_time_permissions); + // m_eventFlagsMap.Add("sensor",(long)scriptEvents.sensor); + m_eventFlagsMap.Add("state_entry", scriptEvents.state_entry); + m_eventFlagsMap.Add("state_exit", scriptEvents.state_exit); + m_eventFlagsMap.Add("timer", scriptEvents.timer); + m_eventFlagsMap.Add("touch", scriptEvents.touch); + m_eventFlagsMap.Add("touch_end", scriptEvents.touch_end); + m_eventFlagsMap.Add("touch_start", scriptEvents.touch_start); + m_eventFlagsMap.Add("object_rez", scriptEvents.object_rez); + } } } diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs index 31ca3f3..419ca8f 100644 --- a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs +++ b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs @@ -92,8 +92,9 @@ namespace OpenSim.Region.ScriptEngine.Common m_state = value; try { + int eventFlags = m_ScriptEngine.m_ScriptManager.GetStateEventFlags(m_localID, m_itemID); + m_host.SetScriptEvents(m_itemID, eventFlags); m_ScriptEngine.m_EventManager.state_entry(m_localID); - } catch (AppDomainUnloadedException) { diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptManager.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptManager.cs index cd2e530..7812c8c 100644 --- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptManager.cs +++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptManager.cs @@ -319,6 +319,29 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase Script.Exec.ExecuteEvent(FunctionName, args); } + public int GetStateEventFlags(uint localID, LLUUID itemID) + { + // Console.WriteLine("GetStateEventFlags for <" + localID + "," + itemID + ">"); + try + { + IScript Script = GetScript(localID, itemID); + if (Script == null) + { + return 0; + } + ExecutorBase.scriptEvents evflags = Script.Exec.GetStateEventFlags(); + return (int)evflags; + } + catch (Exception e) + { + // Console.WriteLine("Failed to get script reference for <" + localID + "," + itemID + ">"); + // Console.WriteLine(e.ToString()); + } + + return 0; + } + + #endregion #region Internal functions to keep track of script -- cgit v1.1