From 6e3367d68ca6e0e632078dc02f52b03bd034afce Mon Sep 17 00:00:00 2001 From: Melanie Thielker Date: Wed, 27 Aug 2008 22:38:36 +0000 Subject: Refactor XScriptInstance to IScriptInstance and move into Shared/. Now engines that want to use the XEngine's instance handling and state persistence can do so. IScriptInstance is optional, but it does require the SmartThreadPool if it is used. --- .../ScriptEngine/Interfaces/IScriptEngine.cs | 3 + .../ScriptEngine/Interfaces/IScriptInstance.cs | 81 ++++++++++++++++++++++ 2 files changed, 84 insertions(+) create mode 100644 OpenSim/Region/ScriptEngine/Interfaces/IScriptInstance.cs (limited to 'OpenSim/Region/ScriptEngine/Interfaces') diff --git a/OpenSim/Region/ScriptEngine/Interfaces/IScriptEngine.cs b/OpenSim/Region/ScriptEngine/Interfaces/IScriptEngine.cs index 0dab318..292858c 100644 --- a/OpenSim/Region/ScriptEngine/Interfaces/IScriptEngine.cs +++ b/OpenSim/Region/ScriptEngine/Interfaces/IScriptEngine.cs @@ -32,6 +32,7 @@ using OpenSim.Region.Environment.Scenes; using libsecondlife; using Nini.Config; using OpenSim.Region.ScriptEngine.Interfaces; +using Amib.Threading; namespace OpenSim.Region.ScriptEngine.Interfaces { @@ -47,6 +48,7 @@ namespace OpenSim.Region.ScriptEngine.Interfaces Object AsyncCommands { get; } ILog Log { get; } string ScriptEngineName { get; } + int MaxScriptQueue { get; } bool PostScriptEvent(LLUUID itemID, EventParams parms); bool PostObjectEvent(uint localID, EventParams parms); @@ -56,6 +58,7 @@ namespace OpenSim.Region.ScriptEngine.Interfaces bool GetScriptState(LLUUID itemID); void SetState(LLUUID itemID, string newState); int GetStartParameter(LLUUID itemID); + IWorkItemResult QueueEventHandler(object parms); DetectParams GetDetectParams(LLUUID item, int number); } diff --git a/OpenSim/Region/ScriptEngine/Interfaces/IScriptInstance.cs b/OpenSim/Region/ScriptEngine/Interfaces/IScriptInstance.cs new file mode 100644 index 0000000..03a3802 --- /dev/null +++ b/OpenSim/Region/ScriptEngine/Interfaces/IScriptInstance.cs @@ -0,0 +1,81 @@ +/* + * Copyright (c) Contributors, http://opensimulator.org/ + * See CONTRIBUTORS.TXT for a full list of copyright holders. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * * Neither the name of the OpenSim Project nor the + * names of its contributors may be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +using System; +using System.Collections; +using System.Collections.Generic; +using libsecondlife; +using log4net; +using OpenSim.Framework; +using OpenSim.Region.ScriptEngine.Shared; +using OpenSim.Region.ScriptEngine.Interfaces; + +namespace OpenSim.Region.ScriptEngine.Interfaces +{ + public enum StateSource + { + NewRez = 0, + PrimCrossing = 1, + AttachmentCrossing = 2 + } + + public interface IScriptInstance + { + bool Running { get; set; } + string State { get; set; } + IScriptEngine Engine { get; } + LLUUID AppDomain { get; set; } + string PrimName { get; } + string ScriptName { get; } + LLUUID ItemID { get; } + LLUUID ObjectID { get; } + uint LocalID { get; } + LLUUID AssetID { get; } + Queue EventQueue { get; } + + void ClearQueue(); + int StartParam { get; set; } + + void RemoveState(); + + void Start(); + bool Stop(int timeout); + void SetState(string state); + + void PostEvent(EventParams data); + object EventProcessor(); + + int EventTime(); + void ResetScript(); + void ApiResetScript(); + Dictionary GetVars(); + void SetVars(Dictionary vars); + DetectParams GetDetectParams(int idx); + LLUUID GetDetectID(int idx); + void SaveState(string assembly); + } +} -- cgit v1.1