try to fix xmr on multiregions per instance. Ugly spargetti ...; remove fixes for 2 llparcel functions that should not be needed; remove xmr own API, it has no business having one.

1 files changed, 15 insertions, 165 deletions

diff --git a/OpenSim/Region/ScriptEngine/XMREngine/XMRScriptThread.cs b/OpenSim/Region/ScriptEngine/XMREngine/XMRScriptThread.cs
index 6470477..7103556 100644
--- a/OpenSim/Region/ScriptEngine/XMREngine/XMRScriptThread.cs
+++ b/OpenSim/Region/ScriptEngine/XMREngine/XMRScriptThread.cs
@@ -32,7 +32,6 @@ using System.Threading;
 
 namespace OpenSim.Region.ScriptEngine.XMREngine
 {
-
     /**
      * @brief There are NUMSCRIPTHREADWKRS of these.
      *        Each sits in a loop checking the Start and Yield queues for 
@@ -40,35 +39,7 @@ namespace OpenSim.Region.ScriptEngine.XMREngine
      */
     public class XMRScriptThread
     {
-        private static int    m_WakeUpOne  = 0;
-        public  static object m_WakeUpLock = new object();
-        private static Dictionary<Thread,XMRScriptThread> m_AllThreads = new Dictionary<Thread,XMRScriptThread> ();
-
-        /**
-         * @brief Something was just added to the Start or Yield queue so
-         *        wake one of the XMRScriptThread instances to run it.
-         */
-        public static void WakeUpOne()
-        {
-            lock (m_WakeUpLock)
-            {
-                m_WakeUpOne ++;
-                Monitor.Pulse (m_WakeUpLock);
-            }
-        }
-
-        public static XMRScriptThread CurrentScriptThread ()
-        {
-            XMRScriptThread st;
-            lock (m_AllThreads) {
-                m_AllThreads.TryGetValue (Thread.CurrentThread, out st);
-            }
-            return st;
-        }
-
-        private bool        m_Exiting = false;
-        private bool        m_SuspendScriptThreadFlag = false;
-        private bool        m_WakeUpThis = false;
+        public bool         m_WakeUpThis = false;
         public  DateTime    m_LastRanAt = DateTime.MinValue;
         public  int         m_ScriptThreadTID = 0;
         public  long        m_ScriptExecTime = 0;
@@ -80,164 +51,43 @@ namespace OpenSim.Region.ScriptEngine.XMREngine
         {
             engine = eng;
             if(i < 0)
-                thd = XMREngine.StartMyThread (RunScriptThread, "xmrengine script", ThreadPriority.Normal);
+                thd = XMREngine.StartMyThread(RunScriptThread, "xmrengine script", ThreadPriority.Normal);
             else
-                thd = XMREngine.StartMyThread (RunScriptThread, "xmrengineExec" + i.ToString(), ThreadPriority.Normal);
-            lock (m_AllThreads)
-                m_AllThreads.Add (thd, this);
-        }
-
-        public void SuspendThread()
-        {
-            m_SuspendScriptThreadFlag = true;
-            WakeUpScriptThread();
-        }
-
-        public void ResumeThread()
-        {
-            m_SuspendScriptThreadFlag = false;
-            WakeUpScriptThread();
+                thd = XMREngine.StartMyThread(RunScriptThread, "xmrengineExec" + i.ToString(), ThreadPriority.Normal);
+            engine.AddThread(thd, this);
+            m_ScriptThreadTID = thd.ManagedThreadId;
         }
 
         public void Terminate()
         {
-            m_Exiting = true;
-            WakeUpScriptThread();
+            m_WakeUpThis = true;
             if(!thd.Join(250))
                 thd.Abort();
-            lock (m_AllThreads)
-                m_AllThreads.Remove (thd);
 
-            thd = null;
-        }
+            engine.RemoveThread(thd);
 
-        public void TimeSlice()
-        {
-            XMRInstance instance = m_RunInstance;
-            if (instance != null)
-                instance.suspendOnCheckRunTemp = true;
+            thd = null;
         }
-
+ 
         /**
          * @brief Wake up this XMRScriptThread instance.
          */
-        private void WakeUpScriptThread()
+        public void WakeUpScriptThread()
         {
-            lock (m_WakeUpLock)
-            {
                 m_WakeUpThis = true;
-                Monitor.PulseAll (m_WakeUpLock);
-            }
         }
 
         /**
-         * @brief Thread that runs the scripts.
+         * @brief A script instance was just removed from the Start or Yield Queue.
+         *        So run it for a little bit then stick in whatever queue it should go in.
          */
+
         private void RunScriptThread()
         {
-            XMRInstance inst;
-            m_ScriptThreadTID = System.Threading.Thread.CurrentThread.ManagedThreadId;
-
-            while (!m_Exiting)
-            {
-                XMREngine.UpdateMyThread ();
-
-                /*
-                 * Handle 'xmr resume/suspend' commands.
-                 */
-                if (m_SuspendScriptThreadFlag)
-                {
-                    lock (m_WakeUpLock) {
-                        while (m_SuspendScriptThreadFlag &&
-                               !m_Exiting &&
-                               (engine.m_ThunkQueue.Count == 0))
-                        {
-                            Monitor.Wait (m_WakeUpLock, Watchdog.DEFAULT_WATCHDOG_TIMEOUT_MS / 2);
-                            XMREngine.UpdateMyThread ();
-                        }
-                    }
-                }
-
-                /*
-                 * Maybe there are some scripts waiting to be migrated in or out.
-                 */
-                ThreadStart thunk = null;
-                lock (m_WakeUpLock)
-                {
-                    if (engine.m_ThunkQueue.Count > 0)
-                        thunk = engine.m_ThunkQueue.Dequeue ();
-                }
-                if (thunk != null)
-                {
-                    inst = (XMRInstance)thunk.Target;
-                    thunk ();
-                    continue;
-                }
-
-                if (engine.m_StartProcessing)
-                {
-                     // If event just queued to any idle scripts
-                     // start them right away.  But only start so
-                     // many so we can make some progress on yield
-                     // queue.
-
-                    int numStarts;
-                    for (numStarts = 5; -- numStarts >= 0;)
-                    {
-                        lock (engine.m_StartQueue)
-                        {
-                            inst = engine.m_StartQueue.RemoveHead();
-                        }
-                        if (inst == null) break;
-                        if (inst.m_IState != XMRInstState.ONSTARTQ) throw new Exception("bad state");
-                        RunInstance (inst);
-                    }
-
-                     // If there is something to run, run it
-                     // then rescan from the beginning in case
-                     // a lot of things have changed meanwhile.
-                     //
-                     // These are considered lower priority than
-                     // m_StartQueue as they have been taking at
-                     // least one quantum of CPU time and event
-                     // handlers are supposed to be quick.
-
-                    lock (engine.m_YieldQueue)
-                    {
-                        inst = engine.m_YieldQueue.RemoveHead();
-                    }
-                    if (inst != null)
-                    {
-                        if (inst.m_IState != XMRInstState.ONYIELDQ) throw new Exception("bad state");
-                        RunInstance(inst);
-                        numStarts = -1;
-                    }
-
-                     // If we left something dangling in the m_StartQueue or m_YieldQueue, go back to check it.
-                    if (numStarts < 0)
-                        continue;
-                }
-
-                 // Nothing to do, sleep.
-
-                lock (m_WakeUpLock)
-                {
-                    if (!m_WakeUpThis && (m_WakeUpOne <= 0) && !m_Exiting)
-                        Monitor.Wait(m_WakeUpLock, Watchdog.DEFAULT_WATCHDOG_TIMEOUT_MS / 2);
-
-                    m_WakeUpThis = false;
-                    if ((m_WakeUpOne > 0) && (-- m_WakeUpOne > 0))
-                        Monitor.Pulse (m_WakeUpLock);
-                }
-            }
-            XMREngine.MyThreadExiting ();
+            engine.RunScriptThread(this);
         }
 
-        /**
-         * @brief A script instance was just removed from the Start or Yield Queue.
-         *        So run it for a little bit then stick in whatever queue it should go in.
-         */
-        private void RunInstance (XMRInstance inst)
+        public void RunInstance (XMRInstance inst)
         {
             m_LastRanAt = DateTime.UtcNow;
             m_ScriptExecTime -= (long)(m_LastRanAt - DateTime.MinValue).TotalMilliseconds;