1 files changed, 54 insertions, 148 deletions

diff --git a/OpenSim/Region/ScriptEngine/XMREngine/XMRInstCapture.cs b/OpenSim/Region/ScriptEngine/YEngine/XMRInstCapture.cs
index ed33108..e90d83b 100644
--- a/OpenSim/Region/ScriptEngine/XMREngine/XMRInstCapture.cs
+++ b/OpenSim/Region/ScriptEngine/YEngine/XMRInstCapture.cs
@@ -26,7 +26,6 @@
  */
 
 using System;
-using System.Threading;
 using System.IO;
 using System.Xml;
 using OpenSim.Region.ScriptEngine.Shared;
@@ -41,7 +40,7 @@ using LSL_Rotation = OpenSim.Region.ScriptEngine.Shared.LSL_Types.Quaternion;
 using LSL_String = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLString;
 using LSL_Vector = OpenSim.Region.ScriptEngine.Shared.LSL_Types.Vector3;
 
-namespace OpenSim.Region.ScriptEngine.XMREngine
+namespace OpenSim.Region.ScriptEngine.Yengine
 {
     public partial class XMRInstance
     {
@@ -54,7 +53,7 @@ namespace OpenSim.Region.ScriptEngine.XMREngine
 
         /**
          * @brief Create an XML element that gives the current state of the script.
-         *   <ScriptState Engine="XMREngine" SourceHash=m_ObjCode.sourceHash Asset=m_Item.AssetID>
+         *   <ScriptState Engine="YEngine" SourceHash=m_ObjCode.sourceHash Asset=m_Item.AssetID>
          *     <Snapshot>globalsandstackdump</Snapshot>
          *     <Running>m_Running</Running>
          *     <DetectArray ...
@@ -71,23 +70,23 @@ namespace OpenSim.Region.ScriptEngine.XMREngine
             // Change this to a 5 second timeout. If things do mess up,
             // we don't want to be stuck forever.
             //
-            m_DetachReady.WaitOne (5000, false);
+            m_DetachReady.WaitOne(5000, false);
 
             XmlElement scriptStateN = doc.CreateElement("", "ScriptState", "");
             scriptStateN.SetAttribute("Engine", m_Engine.ScriptEngineName);
             scriptStateN.SetAttribute("Asset", m_Item.AssetID.ToString());
-            scriptStateN.SetAttribute ("SourceHash", m_ObjCode.sourceHash);
+            scriptStateN.SetAttribute("SourceHash", m_ObjCode.sourceHash);
 
-             // Make sure we aren't executing part of the script so it stays 
-             // stable.  Setting suspendOnCheckRun tells CheckRun() to suspend
-             // and return out so RunOne() will release the lock asap.
+            // Make sure we aren't executing part of the script so it stays 
+            // stable.  Setting suspendOnCheckRun tells CheckRun() to suspend
+            // and return out so RunOne() will release the lock asap.
             suspendOnCheckRunHold = true;
-            lock (m_RunLock)
+            lock(m_RunLock)
             {
                 m_RunOnePhase = "GetExecutionState enter";
                 CheckRunLockInvariants(true);
 
-                 // Get copy of script globals and stack in relocateable form.
+                // Get copy of script globals and stack in relocateable form.
                 MemoryStream snapshotStream = new MemoryStream();
                 MigrateOutEventHandler(snapshotStream);
                 Byte[] snapshotBytes = snapshotStream.ToArray();
@@ -96,21 +95,24 @@ namespace OpenSim.Region.ScriptEngine.XMREngine
                 XmlElement snapshotN = doc.CreateElement("", "Snapshot", "");
                 snapshotN.AppendChild(doc.CreateTextNode(snapshotString));
                 scriptStateN.AppendChild(snapshotN);
-                m_RunOnePhase = "GetExecutionState B"; CheckRunLockInvariants(true);
+                m_RunOnePhase = "GetExecutionState B";
+                CheckRunLockInvariants(true);
 
-                 // "Running" says whether or not we are accepting new events.
+                // "Running" says whether or not we are accepting new events.
                 XmlElement runningN = doc.CreateElement("", "Running", "");
                 runningN.AppendChild(doc.CreateTextNode(m_Running.ToString()));
                 scriptStateN.AppendChild(runningN);
-                m_RunOnePhase = "GetExecutionState C"; CheckRunLockInvariants(true);
+                m_RunOnePhase = "GetExecutionState C";
+                CheckRunLockInvariants(true);
 
-                 // "DoGblInit" says whether or not default:state_entry() will init global vars.
+                // "DoGblInit" says whether or not default:state_entry() will init global vars.
                 XmlElement doGblInitN = doc.CreateElement("", "DoGblInit", "");
                 doGblInitN.AppendChild(doc.CreateTextNode(doGblInit.ToString()));
                 scriptStateN.AppendChild(doGblInitN);
-                m_RunOnePhase = "GetExecutionState D"; CheckRunLockInvariants(true);
+                m_RunOnePhase = "GetExecutionState D";
+                CheckRunLockInvariants(true);
 
-                 // More misc data.
+                // More misc data.
                 XmlNode permissionsN = doc.CreateElement("", "Permissions", "");
                 scriptStateN.AppendChild(permissionsN);
 
@@ -121,30 +123,32 @@ namespace OpenSim.Region.ScriptEngine.XMREngine
                 XmlAttribute maskA = doc.CreateAttribute("", "mask", "");
                 maskA.Value = m_Item.PermsMask.ToString();
                 permissionsN.Attributes.Append(maskA);
-                m_RunOnePhase = "GetExecutionState E"; CheckRunLockInvariants(true);
+                m_RunOnePhase = "GetExecutionState E";
+                CheckRunLockInvariants(true);
 
-                 // "DetectParams" are returned by llDetected...() script functions
-                 // for the currently active event, if any.
-                if (m_DetectParams != null)
+                // "DetectParams" are returned by llDetected...() script functions
+                // for the currently active event, if any.
+                if(m_DetectParams != null)
                 {
                     XmlElement detParArrayN = doc.CreateElement("", "DetectArray", "");
                     AppendXMLDetectArray(doc, detParArrayN, m_DetectParams);
                     scriptStateN.AppendChild(detParArrayN);
                 }
-                m_RunOnePhase = "GetExecutionState F"; CheckRunLockInvariants(true);
-
-                 // Save any events we have in the queue.
-                 // <EventQueue>
-                 //   <Event Name="...">
-                 //     <param>...</param> ...
-                 //     <DetectParams>...</DetectParams> ...
-                 //   </Event>
-                 //   ...
-                 // </EventQueue>
+                m_RunOnePhase = "GetExecutionState F";
+                CheckRunLockInvariants(true);
+
+                // Save any events we have in the queue.
+                // <EventQueue>
+                //   <Event Name="...">
+                //     <param>...</param> ...
+                //     <DetectParams>...</DetectParams> ...
+                //   </Event>
+                //   ...
+                // </EventQueue>
                 XmlElement queuedEventsN = doc.CreateElement("", "EventQueue", "");
-                lock (m_QueueLock)
+                lock(m_QueueLock)
                 {
-                    foreach (EventParams evt in m_EventQueue)
+                    foreach(EventParams evt in m_EventQueue)
                     {
                         XmlElement singleEventN = doc.CreateElement("", "Event", "");
                         singleEventN.SetAttribute("Name", evt.EventName);
@@ -154,26 +158,28 @@ namespace OpenSim.Region.ScriptEngine.XMREngine
                     }
                 }
                 scriptStateN.AppendChild(queuedEventsN);
-                m_RunOnePhase = "GetExecutionState G"; CheckRunLockInvariants(true);
+                m_RunOnePhase = "GetExecutionState G";
+                CheckRunLockInvariants(true);
 
-                 // "Plugins" indicate enabled timers and listens, etc.
-                Object[] pluginData = 
+                // "Plugins" indicate enabled timers and listens, etc.
+                Object[] pluginData =
                         AsyncCommandManager.GetSerializationData(m_Engine, m_ItemID);
 
                 XmlNode plugins = doc.CreateElement("", "Plugins", "");
                 AppendXMLObjectArray(doc, plugins, pluginData, "plugin");
                 scriptStateN.AppendChild(plugins);
-                m_RunOnePhase = "GetExecutionState H"; CheckRunLockInvariants(true);
+                m_RunOnePhase = "GetExecutionState H";
+                CheckRunLockInvariants(true);
 
-                 // Let script run again.
+                // Let script run again.
                 suspendOnCheckRunHold = false;
 
                 m_RunOnePhase = "GetExecutionState leave";
                 CheckRunLockInvariants(true);
             }
 
-             // scriptStateN represents the contents of the .state file so
-             // write the .state file while we are here.
+            // scriptStateN represents the contents of the .state file so
+            // write the .state file while we are here.
             FileStream fs = File.Create(m_StateFileName);
             StreamWriter sw = new StreamWriter(fs);
             sw.Write(scriptStateN.OuterXml);
@@ -185,116 +191,16 @@ namespace OpenSim.Region.ScriptEngine.XMREngine
 
         /**
          * @brief Write script state to output stream.
-         *        The script microthread is at same state on return,
-         *        ie, either inactive or suspended inside CheckRun().
-         *
          * Input:
          *  stream = stream to write event handler state information to
          */
-        private void MigrateOutEventHandler (Stream stream)
+        private void MigrateOutEventHandler(Stream stream)
         {
-            moehexcep = null;
-
-            // do all the work in the MigrateOutEventHandlerThread() method below
-            moehstream = stream;
-
-            XMRScriptThread cst = m_Engine.CurrentScriptThread ();
-            if (cst != null)
-            {
-
-                // we might be getting called inside some LSL Api function
-                // so we are already in script thread and thus must do
-                // migration directly
-                MigrateOutEventHandlerThread ();
-            }
-            else
-            {
-                // some other thread, do migration via a script thread
-                m_Engine.QueueToTrunk(this.MigrateOutEventHandlerThread);
-
-                // wait for it to complete
-                lock (moehdone)
-                {
-                    while (moehstream != null)
-                        Monitor.Wait (moehdone);
-                }
-            }
-
-            // maybe it threw up
-            if (moehexcep != null)
-                throw moehexcep;
-        }
-
-        private Exception moehexcep;
-        private object moehdone = new object ();
-        private Stream moehstream;
-        private void MigrateOutEventHandlerThread ()
-        {
-            Exception except;
-
-            try
-            {
-                 // Resume the microthread and it will throw a StackCaptureException()
-                 // with the stack frames saved to this.stackFrames.
-                 // Then write the saved stack frames to the output stream.
-                 //
-                 // There is a stack only if the event code is not None.
-                if (this.eventCode != ScriptEventCode.None)
-                {
-                    // tell microthread to continue
-                    // it should see captureStackFrames and throw StackCaptureException()
-                    // ...generating XMRStackFrames as it unwinds
-                    this.captureStackFrames = true;
-//                    this.suspendOnCheckRunTemp = true;
-                    except = this.microthread.ResumeEx ();
-                    this.captureStackFrames = false;
-
-                    if (except == null)
-                        throw new Exception ("stack save did not complete");
-
-                    if (!(except is StackCaptureException))
-                        throw except;
-                }
-
-                 // Write script state out, frames and all, to the stream.
-                 // Does not change script state.
-
-                moehstream.WriteByte (migrationVersion);
-                moehstream.WriteByte ((byte)16);
-                this.MigrateOut (new BinaryWriter (moehstream));
-
-                 // Now restore script stack.
-                 // Microthread will suspend inside CheckRun() when restore is complete.
-                if (this.eventCode != ScriptEventCode.None)
-                {
-                    this.stackFramesRestored = false;
-                    except = this.microthread.StartEx ();
-
-                    if (except != null)
-                        throw except;
-
-                    if (!this.stackFramesRestored)
-                        throw new Exception ("restore after save did not complete");
-
-                }
-            }
-            catch (Exception e)
-            {
-                moehexcep = e;
-            }
-            finally
-            {
-                // make sure CheckRunLockInvariants() won't puque
-                if (this.microthread.Active () == 0)
-                    this.eventCode = ScriptEventCode.None;
-
-                // wake the MigrateOutEventHandler() method above
-                lock (moehdone)
-                {
-                    moehstream = null;
-                    Monitor.Pulse (moehdone);
-                }
-            }
+            // Write script state out, frames and all, to the stream.
+            // Does not change script state.
+            stream.WriteByte(migrationVersion);
+            stream.WriteByte((byte)16);
+            this.MigrateOut(new BinaryWriter(stream));
         }
 
         /**
@@ -304,7 +210,7 @@ namespace OpenSim.Region.ScriptEngine.XMREngine
          */
         private static void AppendXMLDetectArray(XmlDocument doc, XmlElement parent, DetectParams[] detect)
         {
-            foreach (DetectParams d in detect)
+            foreach(DetectParams d in detect)
             {
                 XmlElement detectParamsN = GetXMLDetect(doc, d);
                 parent.AppendChild(detectParamsN);
@@ -367,7 +273,7 @@ namespace OpenSim.Region.ScriptEngine.XMREngine
          */
         private static void AppendXMLObjectArray(XmlDocument doc, XmlNode parent, object[] array, string tag)
         {
-            foreach (object o in array)
+            foreach(object o in array)
             {
                 XmlElement element = GetXMLObject(doc, o, tag);
                 parent.AppendChild(element);
@@ -385,7 +291,7 @@ namespace OpenSim.Region.ScriptEngine.XMREngine
             XmlAttribute typ = doc.CreateAttribute("", "type", "");
             XmlElement n = doc.CreateElement("", tag, "");
 
-            if (o is LSL_List)
+            if(o is LSL_List)
             {
                 typ.Value = "list";
                 n.Attributes.Append(typ);