From afea5f22055fd645e95c4e1dcad01e68716fa049 Mon Sep 17 00:00:00 2001 From: Sean Dague Date: Thu, 13 Sep 2007 11:41:42 +0000 Subject: remove ^M, as native storage should be UNIX format, and ^M in/out mashing will happen on the windows side now that eol-style is correct --- OpenSim/Region/ScriptEngine/Common/Executor.cs | 230 ++++++++++++------------- 1 file changed, 115 insertions(+), 115 deletions(-) (limited to 'OpenSim/Region/ScriptEngine/Common/Executor.cs') diff --git a/OpenSim/Region/ScriptEngine/Common/Executor.cs b/OpenSim/Region/ScriptEngine/Common/Executor.cs index d165722..1849085 100644 --- a/OpenSim/Region/ScriptEngine/Common/Executor.cs +++ b/OpenSim/Region/ScriptEngine/Common/Executor.cs @@ -1,115 +1,115 @@ -using System; -using System.Collections.Generic; -using System.Text; -using System.Reflection; -using System.Runtime.Remoting.Lifetime; - -namespace OpenSim.Region.ScriptEngine.Common -{ - public class Executor : MarshalByRefObject - { - // Private instance for each script - - private IScript m_Script; - private Dictionary Events = new Dictionary(); - private bool m_Running = true; - //private List Scripts = new List(); - - public Executor(IScript Script) - { - m_Script = Script; - } - - // Object never expires - public override Object InitializeLifetimeService() - { - //Console.WriteLine("Executor: InitializeLifetimeService()"); - // return null; - ILease lease = (ILease)base.InitializeLifetimeService(); - - if (lease.CurrentState == LeaseState.Initial) - { - lease.InitialLeaseTime = TimeSpan.Zero; // TimeSpan.FromMinutes(1); -// lease.SponsorshipTimeout = TimeSpan.FromMinutes(2); -// lease.RenewOnCallTime = TimeSpan.FromSeconds(2); - } - return lease; - } - - public AppDomain GetAppDomain() - { - return AppDomain.CurrentDomain; - } - - public void ExecuteEvent(string FunctionName, object[] args) - { - // IMPORTANT: Types and MemberInfo-derived objects require a LOT of memory. - // Instead use RuntimeTypeHandle, RuntimeFieldHandle and RunTimeHandle (IntPtr) instead! - //try - //{ - if (m_Running == false) - { - // Script is inactive, do not execute! - return; - } - - string EventName = m_Script.State() + "_event_" + FunctionName; - - //type.InvokeMember(EventName, BindingFlags.InvokeMethod, null, m_Script, args); - - //Console.WriteLine("ScriptEngine Executor.ExecuteEvent: \"" + EventName + "\""); - - if (Events.ContainsKey(EventName) == false) - { - // Not found, create - Type type = m_Script.GetType(); - try - { - MethodInfo mi = type.GetMethod(EventName); - Events.Add(EventName, mi); - } - catch - { - // Event name not found, cache it as not found - Events.Add(EventName, null); - } - } - - // Get event - MethodInfo ev = null; - Events.TryGetValue(EventName, out ev); - - if (ev == null) // No event by that name! - { - //Console.WriteLine("ScriptEngine Can not find any event named: \"" + EventName + "\""); - return; - } - - // Found - //try - //{ - // Invoke it - ev.Invoke(m_Script, args); - - //} - //catch (Exception e) - //{ - // // TODO: Send to correct place - // Console.WriteLine("ScriptEngine Exception attempting to executing script function: " + e.ToString()); - //} - - - //} - //catch { } - } - - - public void StopScript() - { - m_Running = false; - } - - - } - -} +using System; +using System.Collections.Generic; +using System.Text; +using System.Reflection; +using System.Runtime.Remoting.Lifetime; + +namespace OpenSim.Region.ScriptEngine.Common +{ + public class Executor : MarshalByRefObject + { + // Private instance for each script + + private IScript m_Script; + private Dictionary Events = new Dictionary(); + private bool m_Running = true; + //private List Scripts = new List(); + + public Executor(IScript Script) + { + m_Script = Script; + } + + // Object never expires + public override Object InitializeLifetimeService() + { + //Console.WriteLine("Executor: InitializeLifetimeService()"); + // return null; + ILease lease = (ILease)base.InitializeLifetimeService(); + + if (lease.CurrentState == LeaseState.Initial) + { + lease.InitialLeaseTime = TimeSpan.Zero; // TimeSpan.FromMinutes(1); +// lease.SponsorshipTimeout = TimeSpan.FromMinutes(2); +// lease.RenewOnCallTime = TimeSpan.FromSeconds(2); + } + return lease; + } + + public AppDomain GetAppDomain() + { + return AppDomain.CurrentDomain; + } + + public void ExecuteEvent(string FunctionName, object[] args) + { + // IMPORTANT: Types and MemberInfo-derived objects require a LOT of memory. + // Instead use RuntimeTypeHandle, RuntimeFieldHandle and RunTimeHandle (IntPtr) instead! + //try + //{ + if (m_Running == false) + { + // Script is inactive, do not execute! + return; + } + + string EventName = m_Script.State() + "_event_" + FunctionName; + + //type.InvokeMember(EventName, BindingFlags.InvokeMethod, null, m_Script, args); + + //Console.WriteLine("ScriptEngine Executor.ExecuteEvent: \"" + EventName + "\""); + + if (Events.ContainsKey(EventName) == false) + { + // Not found, create + Type type = m_Script.GetType(); + try + { + MethodInfo mi = type.GetMethod(EventName); + Events.Add(EventName, mi); + } + catch + { + // Event name not found, cache it as not found + Events.Add(EventName, null); + } + } + + // Get event + MethodInfo ev = null; + Events.TryGetValue(EventName, out ev); + + if (ev == null) // No event by that name! + { + //Console.WriteLine("ScriptEngine Can not find any event named: \"" + EventName + "\""); + return; + } + + // Found + //try + //{ + // Invoke it + ev.Invoke(m_Script, args); + + //} + //catch (Exception e) + //{ + // // TODO: Send to correct place + // Console.WriteLine("ScriptEngine Exception attempting to executing script function: " + e.ToString()); + //} + + + //} + //catch { } + } + + + public void StopScript() + { + m_Running = false; + } + + + } + +} -- cgit v1.1