rename XMREngine as Yengine (still not all done), big mess source formating changes, move state files to proper folder, fix a source file locking on errors, more changes for cross platform including from Mike,... yes yes i know a messy commit

1 files changed, 133 insertions, 104 deletions

diff --git a/OpenSim/Region/ScriptEngine/XMREngine/XMRInstMisc.cs b/OpenSim/Region/ScriptEngine/YEngine/XMRInstMisc.cs
index 6ff486a..8f020ce 100644
--- a/OpenSim/Region/ScriptEngine/XMREngine/XMRInstMisc.cs
+++ b/OpenSim/Region/ScriptEngine/YEngine/XMRInstMisc.cs
@@ -42,7 +42,7 @@ using OpenSim.Region.ScriptEngine.Interfaces;
 using OpenSim.Region.ScriptEngine.Shared;
 using OpenSim.Region.ScriptEngine.Shared.Api;
 using OpenSim.Region.ScriptEngine.Shared.ScriptBase;
-using OpenSim.Region.ScriptEngine.XMREngine;
+using OpenSim.Region.ScriptEngine.Yengine;
 using OpenSim.Region.Framework.Scenes;
 using log4net;
 
@@ -56,7 +56,7 @@ using LSL_Vector = OpenSim.Region.ScriptEngine.Shared.LSL_Types.Vector3;
 
 // This class exists in the main app domain
 //
-namespace OpenSim.Region.ScriptEngine.XMREngine
+namespace OpenSim.Region.ScriptEngine.Yengine
 {
     public partial class XMRInstance
     {
@@ -80,57 +80,48 @@ namespace OpenSim.Region.ScriptEngine.XMREngine
             suspendOnCheckRunHold = true;
 
             /*
-             * Wait for it to stop executing and prevent it from starting again
-             * as it can't run without a microthread.
+             * Don't send us any more events.
              */
-            lock (m_RunLock)
+            lock(m_RunLock)
             {
-                if (microthread != null)
+                if(m_Part != null)
                 {
-                    m_RunOnePhase = "disposing";
-                    CheckRunLockInvariants(true);
-                    microthread.Dispose ();
-                    microthread = null;
+                    m_Part.RemoveScriptEvents(m_ItemID);
+                    AsyncCommandManager.RemoveScript(m_Engine, m_LocalID, m_ItemID);
+                    m_Part = null;
                 }
             }
 
             /*
-             * Don't send us any more events.
-             */
-            if (m_Part != null)
-            {
-                xmrTrapRegionCrossing (0);
-                m_Part.RemoveScriptEvents(m_ItemID);
-                AsyncCommandManager.RemoveScript(m_Engine, m_LocalID, m_ItemID);
-                m_Part = null;
-            }
-
-            /*
              * Let script methods get garbage collected if no one else is using
              * them.
              */
-            DecObjCodeRefCount ();
+            DecObjCodeRefCount();
         }
 
-        private void DecObjCodeRefCount ()
+        private void DecObjCodeRefCount()
         {
-            if (m_ObjCode != null) {
-                lock (m_CompileLock) {
+            if(m_ObjCode != null)
+            {
+                lock(m_CompileLock)
+                {
                     ScriptObjCode objCode;
 
-                    if (m_CompiledScriptObjCode.TryGetValue (m_ScriptObjCodeKey, out objCode) &&
+                    if(m_CompiledScriptObjCode.TryGetValue(m_ScriptObjCodeKey, out objCode) &&
                         (objCode == m_ObjCode) &&
-                        (-- objCode.refCount == 0)) {
-                        m_CompiledScriptObjCode.Remove (m_ScriptObjCodeKey);
+                        (--objCode.refCount == 0))
+                    {
+                        m_CompiledScriptObjCode.Remove(m_ScriptObjCodeKey);
                     }
                 }
                 m_ObjCode = null;
             }
         }
 
-        public void Verbose (string format, params object[] args)
+        public void Verbose(string format, params object[] args)
         {
-            if (m_Engine.m_Verbose) m_log.DebugFormat (format, args);
+            if(m_Engine.m_Verbose)
+                m_log.DebugFormat(format, args);
         }
 
         // Called by 'xmr top' console command
@@ -138,37 +129,39 @@ namespace OpenSim.Region.ScriptEngine.XMREngine
         //  Sacha 
         public void RunTestTop()
         {
-          if (m_InstEHSlice > 0){
-            Console.WriteLine(m_DescName);
-            Console.WriteLine("    m_LocalID       = " + m_LocalID);
-            Console.WriteLine("    m_ItemID        = " + m_ItemID);
-            Console.WriteLine("    m_Item.AssetID  = " + m_Item.AssetID);
-            Console.WriteLine("    m_StartParam    = " + m_StartParam);
-            Console.WriteLine("    m_PostOnRez     = " + m_PostOnRez);
-            Console.WriteLine("    m_StateSource   = " + m_StateSource);
-            Console.WriteLine("    m_SuspendCount  = " + m_SuspendCount);
-            Console.WriteLine("    m_SleepUntil    = " + m_SleepUntil);
-            Console.WriteLine("    m_IState        = " + m_IState.ToString());
-            Console.WriteLine("    m_StateCode     = " + GetStateName(stateCode));
-            Console.WriteLine("    eventCode       = " + eventCode.ToString());
-            Console.WriteLine("    m_LastRanAt     = " + m_LastRanAt.ToString());
-            Console.WriteLine("    heapUsed/Limit  = " + xmrHeapUsed () + "/" + heapLimit);
-            Console.WriteLine("    m_InstEHEvent   = " + m_InstEHEvent.ToString());
-            Console.WriteLine("    m_InstEHSlice   = " + m_InstEHSlice.ToString());
-          }
+            if(m_InstEHSlice > 0)
+            {
+                Console.WriteLine(m_DescName);
+                Console.WriteLine("    m_LocalID       = " + m_LocalID);
+                Console.WriteLine("    m_ItemID        = " + m_ItemID);
+                Console.WriteLine("    m_Item.AssetID  = " + m_Item.AssetID);
+                Console.WriteLine("    m_StartParam    = " + m_StartParam);
+                Console.WriteLine("    m_PostOnRez     = " + m_PostOnRez);
+                Console.WriteLine("    m_StateSource   = " + m_StateSource);
+                Console.WriteLine("    m_SuspendCount  = " + m_SuspendCount);
+                Console.WriteLine("    m_SleepUntil    = " + m_SleepUntil);
+                Console.WriteLine("    m_IState        = " + m_IState.ToString());
+                Console.WriteLine("    m_StateCode     = " + GetStateName(stateCode));
+                Console.WriteLine("    eventCode       = " + eventCode.ToString());
+                Console.WriteLine("    m_LastRanAt     = " + m_LastRanAt.ToString());
+                Console.WriteLine("    heapUsed/Limit  = " + xmrHeapUsed() + "/" + heapLimit);
+                Console.WriteLine("    m_InstEHEvent   = " + m_InstEHEvent.ToString());
+                Console.WriteLine("    m_InstEHSlice   = " + m_InstEHSlice.ToString());
+            }
         }
 
         // Called by 'xmr ls' console command
         // to dump this script's state to console
         public string RunTestLs(bool flagFull)
         {
-            if (flagFull) {
+            if(flagFull)
+            {
                 StringBuilder sb = new StringBuilder();
                 sb.AppendLine(m_DescName);
                 sb.AppendLine("    m_LocalID            = " + m_LocalID);
-                sb.AppendLine("    m_ItemID             = " + m_ItemID  + "  (.state file)");
+                sb.AppendLine("    m_ItemID             = " + m_ItemID + "  (.state file)");
                 sb.AppendLine("    m_Item.AssetID       = " + m_Item.AssetID);
-                sb.AppendLine("    m_Part.WorldPosition = " + m_Part.GetWorldPosition ());
+                sb.AppendLine("    m_Part.WorldPosition = " + m_Part.GetWorldPosition());
                 sb.AppendLine("    m_ScriptObjCodeKey   = " + m_ScriptObjCodeKey + "  (source text)");
                 sb.AppendLine("    m_StartParam         = " + m_StartParam);
                 sb.AppendLine("    m_PostOnRez          = " + m_PostOnRez);
@@ -185,28 +178,28 @@ namespace OpenSim.Region.ScriptEngine.XMREngine
                 sb.AppendLine("    suspOnCkRunHold      = " + suspendOnCheckRunHold);
                 sb.AppendLine("    suspOnCkRunTemp      = " + suspendOnCheckRunTemp);
                 sb.AppendLine("    m_CheckRunPhase      = " + m_CheckRunPhase);
-                sb.AppendLine("    heapUsed/Limit       = " + xmrHeapUsed () + "/" + heapLimit);
+                sb.AppendLine("    heapUsed/Limit       = " + xmrHeapUsed() + "/" + heapLimit);
                 sb.AppendLine("    m_InstEHEvent        = " + m_InstEHEvent.ToString());
                 sb.AppendLine("    m_InstEHSlice        = " + m_InstEHSlice.ToString());
                 sb.AppendLine("    m_CPUTime            = " + m_CPUTime);
                 sb.AppendLine("    callMode             = " + callMode);
-                sb.AppendLine("    captureStackFrames   = " + captureStackFrames);
-                sb.AppendLine("    stackFramesRestored  = " + stackFramesRestored);
-                lock (m_QueueLock)
+                lock(m_QueueLock)
                 {
                     sb.AppendLine("    m_Running            = " + m_Running);
-                    foreach (EventParams evt in m_EventQueue)
+                    foreach(EventParams evt in m_EventQueue)
                     {
                         sb.AppendLine("        evt.EventName        = " + evt.EventName);
                     }
                 }
                 return sb.ToString();
-            } else {
-                return String.Format("{0} {1} {2} {3} {4} {5}", 
-                        m_ItemID, 
-                        m_CPUTime.ToString("F3").PadLeft(9), 
-                        m_InstEHEvent.ToString().PadLeft(9), 
-                        m_IState.ToString().PadRight(10), 
+            }
+            else
+            {
+                return String.Format("{0} {1} {2} {3} {4} {5}",
+                        m_ItemID,
+                        m_CPUTime.ToString("F3").PadLeft(9),
+                        m_InstEHEvent.ToString().PadLeft(9),
+                        m_IState.ToString().PadRight(10),
                         m_Part.GetWorldPosition().ToString().PadRight(32),
                         m_DescName);
             }
@@ -218,16 +211,16 @@ namespace OpenSim.Region.ScriptEngine.XMREngine
          */
         public int GetStateEventFlags(int stateCode)
         {
-            if ((stateCode < 0) ||
+            if((stateCode < 0) ||
                 (stateCode >= m_ObjCode.scriptEventHandlerTable.GetLength(0)))
             {
                 return 0;
             }
 
             int code = 0;
-            for (int i = 0 ; i < 32; i ++)
+            for(int i = 0; i < 32; i++)
             {
-                if (m_ObjCode.scriptEventHandlerTable[stateCode, i] != null)
+                if(m_ObjCode.scriptEventHandlerTable[stateCode, i] != null)
                 {
                     code |= 1 << i;
                 }
@@ -239,41 +232,47 @@ namespace OpenSim.Region.ScriptEngine.XMREngine
         /**
          * @brief Get the .state file name.
          */
-        public static string GetStateFileName (string scriptBasePath, UUID itemID)
+        public static string GetStateFileName(string scriptBasePath, UUID itemID)
         {
-            return GetScriptFileName (scriptBasePath, itemID.ToString() + ".state");
+            return GetScriptFileName(scriptBasePath, itemID.ToString() + ".state");
         }
 
-        public string GetScriptFileName (string filename)
+        public string GetScriptFileName(string filename)
         {
-            return GetScriptFileName (m_ScriptBasePath, filename);
+            return GetScriptFileName(m_ScriptBasePath, filename);
         }
 
-        public static string GetScriptFileName (string scriptBasePath, string filename)
+        public static string GetScriptFileName(string scriptBasePath, string filename)
         {
             /*
              * Get old path, ie, all files lumped in a single huge directory.
              */
-            string oldPath = Path.Combine (scriptBasePath, filename);
+            string oldPath = Path.Combine(scriptBasePath, filename);
 
             /*
              * Get new path, ie, files split up based on first 2 chars of name.
              */
-            string subdir = filename.Substring (0, 2);
-            filename = filename.Substring (2);
-            scriptBasePath = Path.Combine (scriptBasePath, subdir);
-            Directory.CreateDirectory (scriptBasePath);
-            string newPath = Path.Combine (scriptBasePath, filename);
+            //           string subdir = filename.Substring (0, 2);
+            //           filename = filename.Substring (2);
+            string subdir = filename.Substring(0, 1);
+            filename = filename.Substring(1);
+            scriptBasePath = Path.Combine(scriptBasePath, subdir);
+            Directory.CreateDirectory(scriptBasePath);
+            string newPath = Path.Combine(scriptBasePath, filename);
 
             /*
              * If file exists only in old location, move to new location.
              * If file exists in both locations, delete old location.
              */
-            if (File.Exists (oldPath)) {
-                if (File.Exists (newPath)) {
-                    File.Delete (oldPath);
-                } else {
-                    File.Move (oldPath, newPath);
+            if(File.Exists(oldPath))
+            {
+                if(File.Exists(newPath))
+                {
+                    File.Delete(oldPath);
+                }
+                else
+                {
+                    File.Move(oldPath, newPath);
                 }
             }
 
@@ -286,12 +285,15 @@ namespace OpenSim.Region.ScriptEngine.XMREngine
         /**
          * @brief Decode state code (int) to state name (string).
          */
-        public string GetStateName (int stateCode)
+        public string GetStateName(int stateCode)
         {
-            try {
+            try
+            {
                 return m_ObjCode.stateNames[stateCode];
-            } catch {
-                return stateCode.ToString ();
+            }
+            catch
+            {
+                return stateCode.ToString();
             }
         }
 
@@ -300,42 +302,66 @@ namespace OpenSim.Region.ScriptEngine.XMREngine
          */
         public int StartParam
         {
-            get { return m_StartParam; }
-            set { m_StartParam = value; }
+            get
+            {
+                return m_StartParam;
+            }
+            set
+            {
+                m_StartParam = value;
+            }
         }
 
         public SceneObjectPart SceneObject
         {
-            get { return m_Part; }
+            get
+            {
+                return m_Part;
+            }
         }
 
         public DetectParams[] DetectParams
         {
-            get { return m_DetectParams; }
-            set { m_DetectParams = value; }
+            get
+            {
+                return m_DetectParams;
+            }
+            set
+            {
+                m_DetectParams = value;
+            }
         }
 
         public UUID ItemID
         {
-            get { return m_ItemID; }
+            get
+            {
+                return m_ItemID;
+            }
         }
 
         public UUID AssetID
         {
-            get { return m_Item.AssetID; }
+            get
+            {
+                return m_Item.AssetID;
+            }
         }
 
         public bool Running
         {
-            get { return m_Running; }
+            get
+            {
+                return m_Running;
+            }
             set
             {
-                lock (m_QueueLock)
+                lock(m_QueueLock)
                 {
                     m_Running = value;
-                    if (!value)
+                    if(!value)
                     {
-                        EmptyEventQueues ();
+                        EmptyEventQueues();
                     }
                 }
             }
@@ -345,26 +371,28 @@ namespace OpenSim.Region.ScriptEngine.XMREngine
          * @brief Empty out the event queues.
          *        Assumes caller has the m_QueueLock locked.
          */
-        public void EmptyEventQueues ()
+        public void EmptyEventQueues()
         {
             m_EventQueue.Clear();
-            for (int i = m_EventCounts.Length; -- i >= 0;) m_EventCounts[i] = 0;
+            for(int i = m_EventCounts.Length; --i >= 0;)
+                m_EventCounts[i] = 0;
         }
 
         /**
          * @brief Convert an LSL vector to an Openmetaverse vector.
          */
-        public static OpenMetaverse.Vector3 LSLVec2OMVec (LSL_Vector lslVec)
+        public static OpenMetaverse.Vector3 LSLVec2OMVec(LSL_Vector lslVec)
         {
-            return new OpenMetaverse.Vector3 ((float)lslVec.x, (float)lslVec.y, (float)lslVec.z);
+            return new OpenMetaverse.Vector3((float)lslVec.x, (float)lslVec.y, (float)lslVec.z);
         }
 
         /**
          * @brief Extract an integer from an element of an LSL_List.
          */
-        public static int ListInt (object element)
+        public static int ListInt(object element)
         {
-            if (element is LSL_Integer) {
+            if(element is LSL_Integer)
+            {
                 return (int)(LSL_Integer)element;
             }
             return (int)element;
@@ -373,9 +401,10 @@ namespace OpenSim.Region.ScriptEngine.XMREngine
         /**
          * @brief Extract a string from an element of an LSL_List.
          */
-        public static string ListStr (object element)
+        public static string ListStr(object element)
         {
-            if (element is LSL_String) {
+            if(element is LSL_String)
+            {
                 return (string)(LSL_String)element;
             }
             return (string)element;