clockwerk-opensim-stable – Diff between revs 1 and 2

Subversion Repositories:

?pathlinks?

Rev 1 – Details – Blame – Last modification – View Log

     /// </summary>
     public class AsyncCommandManager
+    {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
         private static Thread cmdHandlerThread;
+        private static int cmdHandlerThreadCycleSleepms;
-        private static int cmdHandlerThreadCycleSleepms;
+	private static readonly System.Timers.Timer cmdEventTimer = new System.Timers.Timer();
         /// <summary>
         /// Lock for reading/writing static components of AsyncCommandManager.
                 if (!m_SensorRepeat.ContainsKey(m_ScriptEngine))
                     m_SensorRepeat[m_ScriptEngine] = new SensorRepeat(this);
                 if (!m_XmlRequest.ContainsKey(m_ScriptEngine))
                     m_XmlRequest[m_ScriptEngine] = new XmlRequest(this);
+                if (cmdEventTimer.Enabled.Equals(true)) return;
+                // Start the timer
-                StartThread();
+                cmdEventTimer.Elapsed += (sender, args) =>
+                {
+                    try
+                    {
+                        DoOneCmdHandlerPass();
+                    }
+                    catch (Exception e)
+                    {
+                        m_log.Error("[ASYNC COMMAND MANAGER]: Exception in command handler pass: ", e);
-            }
+                    }
+                };
+                cmdEventTimer.Interval = cmdHandlerThreadCycleSleepms;
-        }
-        private static void StartThread()
-        {
-            if (cmdHandlerThread == null)
-            {
-                // Start the thread that will be doing the work
-                cmdHandlerThread
-                    = Watchdog.StartThread(
+                cmdEventTimer.Enabled = true;
                         CmdHandlerThreadLoop, "AsyncLSLCmdHandlerThread", ThreadPriority.Normal, true, true);
+            }
+        }
         private void ReadConfig()
         {
 //            cmdHandlerThreadCycleSleepms = m_ScriptEngine.Config.GetInt("AsyncLLCommandLoopms", 100);
             // TODO: Make this sane again
-            cmdHandlerThreadCycleSleepms = 100;
+            cmdHandlerThreadCycleSleepms = 50;
+        }
+                    }
+                }
+            }
+        }
+    }
-}
+}