remove ^M, as native storage should be UNIX format, and ^M in/out mashing

will happen on the windows side now that eol-style is correct
author: Sean Dague 2007-09-13 11:41:42 +0000
committer: Sean Dague 2007-09-13 11:41:42 +0000
commit: afea5f22055fd645e95c4e1dcad01e68716fa049 (patch)
tree: 73dbc6fff4cba36c559234b66d24c84e00f3f162 /OpenSim/Region/ScriptEngine/DotNetEngine/LSLLongCmdHandler.cs
parent: adding eol-style attributes on new files (diff)
download: opensim-SC_OLD-afea5f22055fd645e95c4e1dcad01e68716fa049.zip
opensim-SC_OLD-afea5f22055fd645e95c4e1dcad01e68716fa049.tar.gz
opensim-SC_OLD-afea5f22055fd645e95c4e1dcad01e68716fa049.tar.bz2
opensim-SC_OLD-afea5f22055fd645e95c4e1dcad01e68716fa049.tar.xz
1 files changed, 148 insertions, 148 deletions
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/LSLLongCmdHandler.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/LSLLongCmdHandler.cs
index 7ce6556..af8a62e 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/LSLLongCmdHandler.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/LSLLongCmdHandler.cs
@@ -1,148 +1,148 @@
-using System;
+using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
-using System.Text;
+using System.Text;
-using System.Threading;
+using System.Threading;
-using libsecondlife;
+using libsecondlife;
-namespace OpenSim.Region.ScriptEngine.DotNetEngine
+namespace OpenSim.Region.ScriptEngine.DotNetEngine
-{
+{
-    /// <summary>
+    /// <summary>
-    /// Handles LSL commands that takes long time and returns an event, for example timers, HTTP requests, etc.
+    /// Handles LSL commands that takes long time and returns an event, for example timers, HTTP requests, etc.
-    /// </summary>
+    /// </summary>
-    class LSLLongCmdHandler
+    class LSLLongCmdHandler
-    {
+    {
-        private Thread cmdHandlerThread;
+        private Thread cmdHandlerThread;
-        private int cmdHandlerThreadCycleSleepms = 100;
+        private int cmdHandlerThreadCycleSleepms = 100;
-        private ScriptEngine m_ScriptEngine;
+        private ScriptEngine m_ScriptEngine;
-        public LSLLongCmdHandler(ScriptEngine _ScriptEngine)
+        public LSLLongCmdHandler(ScriptEngine _ScriptEngine)
-        {
+        {
-            m_ScriptEngine = _ScriptEngine;
+            m_ScriptEngine = _ScriptEngine;
-            // Start the thread that will be doing the work
+            // Start the thread that will be doing the work
-            cmdHandlerThread = new Thread(CmdHandlerThreadLoop);
+            cmdHandlerThread = new Thread(CmdHandlerThreadLoop);
-            cmdHandlerThread.Name = "CmdHandlerThread";
+            cmdHandlerThread.Name = "CmdHandlerThread";
-            cmdHandlerThread.Priority = ThreadPriority.BelowNormal;
+            cmdHandlerThread.Priority = ThreadPriority.BelowNormal;
-            cmdHandlerThread.IsBackground = true;
+            cmdHandlerThread.IsBackground = true;
-            cmdHandlerThread.Start();
+            cmdHandlerThread.Start();
-        }
+        }
-        ~LSLLongCmdHandler()
+        ~LSLLongCmdHandler()
-        {
+        {
-            // Shut down thread
+            // Shut down thread
-            try
+            try
-            {
+            {
-                if (cmdHandlerThread != null)
+                if (cmdHandlerThread != null)
-                {
+                {
-                    if (cmdHandlerThread.IsAlive == true)
+                    if (cmdHandlerThread.IsAlive == true)
-                    {
+                    {
-                        cmdHandlerThread.Abort();
+                        cmdHandlerThread.Abort();
-                        cmdHandlerThread.Join();
+                        cmdHandlerThread.Join();
-                    }
+                    }
-                }
+                }
-            }
+            }
-            catch { }
+            catch { }
-        }
+        }
-        private void CmdHandlerThreadLoop()
+        private void CmdHandlerThreadLoop()
-        {
+        {
-            while (true)
+            while (true)
-            {
+            {
-                // Check timers
+                // Check timers
-                CheckTimerEvents();                    
+                CheckTimerEvents();                    
-                // Sleep before next cycle
+                // Sleep before next cycle
-                Thread.Sleep(cmdHandlerThreadCycleSleepms);
+                Thread.Sleep(cmdHandlerThreadCycleSleepms);
-            }
+            }
-        }
+        }
-        /// <summary>
+        /// <summary>
-        /// Remove a specific script (and all its pending commands)
+        /// Remove a specific script (and all its pending commands)
-        /// </summary>
+        /// </summary>
-        /// <param name="m_localID"></param>
+        /// <param name="m_localID"></param>
-        /// <param name="m_itemID"></param>
+        /// <param name="m_itemID"></param>
-        public void RemoveScript(uint m_localID, LLUUID m_itemID)
+        public void RemoveScript(uint m_localID, LLUUID m_itemID)
-        {
+        {
-            // Remove a specific script
+            // Remove a specific script
-            // Remove from: Timers
+            // Remove from: Timers
-            UnSetTimerEvents(m_localID, m_itemID);
+            UnSetTimerEvents(m_localID, m_itemID);
-        }
+        }
-        //
+        //
-        // TIMER
+        // TIMER
-        //
+        //
-        private class TimerClass
+        private class TimerClass
-        {
+        {
-            public uint localID;
+            public uint localID;
-            public LLUUID itemID;
+            public LLUUID itemID;
-            public double interval;
+            public double interval;
-            public DateTime next;
+            public DateTime next;
-        }
+        }
-        private List<TimerClass> Timers = new List<TimerClass>();
+        private List<TimerClass> Timers = new List<TimerClass>();
-        private object ListLock = new object();
+        private object ListLock = new object();
-        public void SetTimerEvent(uint m_localID, LLUUID m_itemID, double sec)
+        public void SetTimerEvent(uint m_localID, LLUUID m_itemID, double sec)
-        {
+        {
-            Console.WriteLine("SetTimerEvent");
+            Console.WriteLine("SetTimerEvent");
-            // Always remove first, in case this is a re-set
+            // Always remove first, in case this is a re-set
-            UnSetTimerEvents(m_localID, m_itemID);
+            UnSetTimerEvents(m_localID, m_itemID);
-            if (sec == 0) // Disabling timer
+            if (sec == 0) // Disabling timer
-                return;
+                return;
-            // Add to timer
+            // Add to timer
-            TimerClass ts = new TimerClass();
+            TimerClass ts = new TimerClass();
-            ts.localID = m_localID;
+            ts.localID = m_localID;
-            ts.itemID = m_itemID;
+            ts.itemID = m_itemID;
-            ts.interval = sec;
+            ts.interval = sec;
-            ts.next = DateTime.Now.ToUniversalTime().AddSeconds(ts.interval);
+            ts.next = DateTime.Now.ToUniversalTime().AddSeconds(ts.interval);
-            lock (ListLock)
+            lock (ListLock)
-            {
+            {
-                Timers.Add(ts);
+                Timers.Add(ts);
-            }
+            }
-        }
+        }
-        public void UnSetTimerEvents(uint m_localID, LLUUID m_itemID)
+        public void UnSetTimerEvents(uint m_localID, LLUUID m_itemID)
-        {
+        {
-            // Remove from timer
+            // Remove from timer
-            lock (ListLock)
+            lock (ListLock)
-            {
+            {
-                List<TimerClass> NewTimers = new List<TimerClass>();
+                List<TimerClass> NewTimers = new List<TimerClass>();
-                foreach (TimerClass ts in Timers)
+                foreach (TimerClass ts in Timers)
-                {
+                {
-                    if (ts.localID != m_localID && ts.itemID != m_itemID)
+                    if (ts.localID != m_localID && ts.itemID != m_itemID)
-                    {
+                    {
-                        NewTimers.Add(ts);
+                        NewTimers.Add(ts);
-                    }
+                    }
-                }
+                }
-                Timers.Clear();
+                Timers.Clear();
-                Timers = NewTimers;
+                Timers = NewTimers;
-            }
+            }
-        }
+        }
-        public void CheckTimerEvents()
+        public void CheckTimerEvents()
-        {
+        {
-            // Nothing to do here?
+            // Nothing to do here?
-            if (Timers.Count == 0)
+            if (Timers.Count == 0)
-                return;
+                return;
-            lock (ListLock)
+            lock (ListLock)
-            {
+            {
-                // Go through all timers
+                // Go through all timers
-                foreach (TimerClass ts in Timers)
+                foreach (TimerClass ts in Timers)
-                {
+                {
-                    // Time has passed?
+                    // Time has passed?
-                    if (ts.next.ToUniversalTime() < DateTime.Now.ToUniversalTime())
+                    if (ts.next.ToUniversalTime() < DateTime.Now.ToUniversalTime())
-                    {
+                    {
-                        // Add it to queue
+                        // Add it to queue
-                        m_ScriptEngine.m_EventQueueManager.AddToScriptQueue(ts.localID, ts.itemID, "timer", new object[] { });
+                        m_ScriptEngine.m_EventQueueManager.AddToScriptQueue(ts.localID, ts.itemID, "timer", new object[] { });
-                        // set next interval
+                        // set next interval
-                        ts.next = DateTime.Now.ToUniversalTime().AddSeconds(ts.interval);
+                        ts.next = DateTime.Now.ToUniversalTime().AddSeconds(ts.interval);
-                    }
+                    }
-                }
+                }
-            } // lock
+            } // lock
-        }
+        }
-    }
+    }
-}
+}
author	Sean Dague	2007-09-13 11:41:42 +0000
committer	Sean Dague	2007-09-13 11:41:42 +0000
commit	afea5f22055fd645e95c4e1dcad01e68716fa049 (patch)
tree	73dbc6fff4cba36c559234b66d24c84e00f3f162 /OpenSim/Region/ScriptEngine/DotNetEngine/LSLLongCmdHandler.cs
parent	adding eol-style attributes on new files (diff)
download	opensim-SC_OLD-afea5f22055fd645e95c4e1dcad01e68716fa049.zip opensim-SC_OLD-afea5f22055fd645e95c4e1dcad01e68716fa049.tar.gz opensim-SC_OLD-afea5f22055fd645e95c4e1dcad01e68716fa049.tar.bz2 opensim-SC_OLD-afea5f22055fd645e95c4e1dcad01e68716fa049.tar.xz

diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/LSLLongCmdHandler.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/LSLLongCmdHandler.cs index 7ce6556..af8a62e 100644 --- a/OpenSim/Region/ScriptEngine/DotNetEngine/LSLLongCmdHandler.cs +++ b/OpenSim/Region/ScriptEngine/DotNetEngine/LSLLongCmdHandler.cs
@@ -1,148 +1,148 @@
1	using System;	1	using System;
2	using System.Collections.Generic;	2	using System.Collections.Generic;
3	using System.Text;	3	using System.Text;
4	using System.Threading;	4	using System.Threading;
5	using libsecondlife;	5	using libsecondlife;
6		6
7	namespace OpenSim.Region.ScriptEngine.DotNetEngine	7	namespace OpenSim.Region.ScriptEngine.DotNetEngine
8	{	8	{
9	/// <summary>	9	/// <summary>
10	/// Handles LSL commands that takes long time and returns an event, for example timers, HTTP requests, etc.	10	/// Handles LSL commands that takes long time and returns an event, for example timers, HTTP requests, etc.
11	/// </summary>	11	/// </summary>
12	class LSLLongCmdHandler	12	class LSLLongCmdHandler
13	{	13	{
14	private Thread cmdHandlerThread;	14	private Thread cmdHandlerThread;
15	private int cmdHandlerThreadCycleSleepms = 100;	15	private int cmdHandlerThreadCycleSleepms = 100;
16		16
17	private ScriptEngine m_ScriptEngine;	17	private ScriptEngine m_ScriptEngine;
18	public LSLLongCmdHandler(ScriptEngine _ScriptEngine)	18	public LSLLongCmdHandler(ScriptEngine _ScriptEngine)
19	{	19	{
20	m_ScriptEngine = _ScriptEngine;	20	m_ScriptEngine = _ScriptEngine;
21		21
22	// Start the thread that will be doing the work	22	// Start the thread that will be doing the work
23	cmdHandlerThread = new Thread(CmdHandlerThreadLoop);	23	cmdHandlerThread = new Thread(CmdHandlerThreadLoop);
24	cmdHandlerThread.Name = "CmdHandlerThread";	24	cmdHandlerThread.Name = "CmdHandlerThread";
25	cmdHandlerThread.Priority = ThreadPriority.BelowNormal;	25	cmdHandlerThread.Priority = ThreadPriority.BelowNormal;
26	cmdHandlerThread.IsBackground = true;	26	cmdHandlerThread.IsBackground = true;
27	cmdHandlerThread.Start();	27	cmdHandlerThread.Start();
28	}	28	}
29	~LSLLongCmdHandler()	29	~LSLLongCmdHandler()
30	{	30	{
31	// Shut down thread	31	// Shut down thread
32	try	32	try
33	{	33	{
34	if (cmdHandlerThread != null)	34	if (cmdHandlerThread != null)
35	{	35	{
36	if (cmdHandlerThread.IsAlive == true)	36	if (cmdHandlerThread.IsAlive == true)
37	{	37	{
38	cmdHandlerThread.Abort();	38	cmdHandlerThread.Abort();
39	cmdHandlerThread.Join();	39	cmdHandlerThread.Join();
40	}	40	}
41	}	41	}
42	}	42	}
43	catch { }	43	catch { }
44	}	44	}
45		45
46	private void CmdHandlerThreadLoop()	46	private void CmdHandlerThreadLoop()
47	{	47	{
48	while (true)	48	while (true)
49	{	49	{
50	// Check timers	50	// Check timers
51	CheckTimerEvents();	51	CheckTimerEvents();
52		52
53	// Sleep before next cycle	53	// Sleep before next cycle
54	Thread.Sleep(cmdHandlerThreadCycleSleepms);	54	Thread.Sleep(cmdHandlerThreadCycleSleepms);
55	}	55	}
56	}	56	}
57		57
58	/// <summary>	58	/// <summary>
59	/// Remove a specific script (and all its pending commands)	59	/// Remove a specific script (and all its pending commands)
60	/// </summary>	60	/// </summary>
61	/// <param name="m_localID"></param>	61	/// <param name="m_localID"></param>
62	/// <param name="m_itemID"></param>	62	/// <param name="m_itemID"></param>
63	public void RemoveScript(uint m_localID, LLUUID m_itemID)	63	public void RemoveScript(uint m_localID, LLUUID m_itemID)
64	{	64	{
65	// Remove a specific script	65	// Remove a specific script
66		66
67	// Remove from: Timers	67	// Remove from: Timers
68	UnSetTimerEvents(m_localID, m_itemID);	68	UnSetTimerEvents(m_localID, m_itemID);
69	}	69	}
70		70
71		71
72	//	72	//
73	// TIMER	73	// TIMER
74	//	74	//
75	private class TimerClass	75	private class TimerClass
76	{	76	{
77	public uint localID;	77	public uint localID;
78	public LLUUID itemID;	78	public LLUUID itemID;
79	public double interval;	79	public double interval;
80	public DateTime next;	80	public DateTime next;
81	}	81	}
82	private List<TimerClass> Timers = new List<TimerClass>();	82	private List<TimerClass> Timers = new List<TimerClass>();
83	private object ListLock = new object();	83	private object ListLock = new object();
84	public void SetTimerEvent(uint m_localID, LLUUID m_itemID, double sec)	84	public void SetTimerEvent(uint m_localID, LLUUID m_itemID, double sec)
85	{	85	{
86	Console.WriteLine("SetTimerEvent");	86	Console.WriteLine("SetTimerEvent");
87		87
88	// Always remove first, in case this is a re-set	88	// Always remove first, in case this is a re-set
89	UnSetTimerEvents(m_localID, m_itemID);	89	UnSetTimerEvents(m_localID, m_itemID);
90	if (sec == 0) // Disabling timer	90	if (sec == 0) // Disabling timer
91	return;	91	return;
92		92
93	// Add to timer	93	// Add to timer
94	TimerClass ts = new TimerClass();	94	TimerClass ts = new TimerClass();
95	ts.localID = m_localID;	95	ts.localID = m_localID;
96	ts.itemID = m_itemID;	96	ts.itemID = m_itemID;
97	ts.interval = sec;	97	ts.interval = sec;
98	ts.next = DateTime.Now.ToUniversalTime().AddSeconds(ts.interval);	98	ts.next = DateTime.Now.ToUniversalTime().AddSeconds(ts.interval);
99	lock (ListLock)	99	lock (ListLock)
100	{	100	{
101	Timers.Add(ts);	101	Timers.Add(ts);
102	}	102	}
103	}	103	}
104	public void UnSetTimerEvents(uint m_localID, LLUUID m_itemID)	104	public void UnSetTimerEvents(uint m_localID, LLUUID m_itemID)
105	{	105	{
106	// Remove from timer	106	// Remove from timer
107	lock (ListLock)	107	lock (ListLock)
108	{	108	{
109	List<TimerClass> NewTimers = new List<TimerClass>();	109	List<TimerClass> NewTimers = new List<TimerClass>();
110	foreach (TimerClass ts in Timers)	110	foreach (TimerClass ts in Timers)
111	{	111	{
112	if (ts.localID != m_localID && ts.itemID != m_itemID)	112	if (ts.localID != m_localID && ts.itemID != m_itemID)
113	{	113	{
114	NewTimers.Add(ts);	114	NewTimers.Add(ts);
115	}	115	}
116	}	116	}
117	Timers.Clear();	117	Timers.Clear();
118	Timers = NewTimers;	118	Timers = NewTimers;
119	}	119	}
120	}	120	}
121	public void CheckTimerEvents()	121	public void CheckTimerEvents()
122	{	122	{
123	// Nothing to do here?	123	// Nothing to do here?
124	if (Timers.Count == 0)	124	if (Timers.Count == 0)
125	return;	125	return;
126		126
127	lock (ListLock)	127	lock (ListLock)
128	{	128	{
129		129
130	// Go through all timers	130	// Go through all timers
131	foreach (TimerClass ts in Timers)	131	foreach (TimerClass ts in Timers)
132	{	132	{
133	// Time has passed?	133	// Time has passed?
134	if (ts.next.ToUniversalTime() < DateTime.Now.ToUniversalTime())	134	if (ts.next.ToUniversalTime() < DateTime.Now.ToUniversalTime())
135	{	135	{
136	// Add it to queue	136	// Add it to queue
137	m_ScriptEngine.m_EventQueueManager.AddToScriptQueue(ts.localID, ts.itemID, "timer", new object[] { });	137	m_ScriptEngine.m_EventQueueManager.AddToScriptQueue(ts.localID, ts.itemID, "timer", new object[] { });
138	// set next interval	138	// set next interval
139		139
140		140
141	ts.next = DateTime.Now.ToUniversalTime().AddSeconds(ts.interval);	141	ts.next = DateTime.Now.ToUniversalTime().AddSeconds(ts.interval);
142	}	142	}
143	}	143	}
144	} // lock	144	} // lock
145	}	145	}
146		146
147	}	147	}
148	}	148	}