diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptManager.cs | 82 | ||||
-rw-r--r-- | OpenSim/Region/ScriptEngine/Common/TRPC/TCPClient.cs | 13 |
2 files changed, 49 insertions, 46 deletions
diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptManager.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptManager.cs index 04de990..09f84d6 100644 --- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptManager.cs +++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptManager.cs | |||
@@ -141,26 +141,27 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase | |||
141 | } | 141 | } |
142 | 142 | ||
143 | private static int privateThreadCount = 0; | 143 | private static int privateThreadCount = 0; |
144 | private Thread StartScriptLoadUnloadThread() | 144 | // TODO: unused |
145 | { | 145 | // private Thread StartScriptLoadUnloadThread() |
146 | Thread t = new Thread(ScriptLoadUnloadThreadLoop); | 146 | // { |
147 | string name = "ScriptLoadUnloadThread:"; | 147 | // Thread t = new Thread(ScriptLoadUnloadThreadLoop); |
148 | if (PrivateThread) | 148 | // string name = "ScriptLoadUnloadThread:"; |
149 | { | 149 | // if (PrivateThread) |
150 | name += "Private:" + privateThreadCount; | 150 | // { |
151 | privateThreadCount++; | 151 | // name += "Private:" + privateThreadCount; |
152 | } | 152 | // privateThreadCount++; |
153 | else | 153 | // } |
154 | { | 154 | // else |
155 | name += "Shared"; | 155 | // { |
156 | } | 156 | // name += "Shared"; |
157 | t.Name = name; | 157 | // } |
158 | t.IsBackground = true; | 158 | // t.Name = name; |
159 | t.Priority = ThreadPriority.Normal; | 159 | // t.IsBackground = true; |
160 | t.Start(); | 160 | // t.Priority = ThreadPriority.Normal; |
161 | OpenSim.Framework.ThreadTracker.Add(t); | 161 | // t.Start(); |
162 | return t; | 162 | // OpenSim.Framework.ThreadTracker.Add(t); |
163 | } | 163 | // return t; |
164 | // } | ||
164 | 165 | ||
165 | ~ScriptManager() | 166 | ~ScriptManager() |
166 | { | 167 | { |
@@ -184,26 +185,27 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase | |||
184 | 185 | ||
185 | #region Load / Unload scripts (Thread loop) | 186 | #region Load / Unload scripts (Thread loop) |
186 | 187 | ||
187 | private void ScriptLoadUnloadThreadLoop() | 188 | // TODO: unused |
188 | { | 189 | // private void ScriptLoadUnloadThreadLoop() |
189 | try | 190 | // { |
190 | { | 191 | // try |
191 | while (true) | 192 | // { |
192 | { | 193 | // while (true) |
193 | if (LUQueue.Count == 0) | 194 | // { |
194 | Thread.Sleep(scriptLoadUnloadThread_IdleSleepms); | 195 | // if (LUQueue.Count == 0) |
195 | //if (PleaseShutdown) | 196 | // Thread.Sleep(scriptLoadUnloadThread_IdleSleepms); |
196 | // return; | 197 | // //if (PleaseShutdown) |
197 | DoScriptLoadUnload(); | 198 | // // return; |
198 | } | 199 | // DoScriptLoadUnload(); |
199 | } | 200 | // } |
200 | catch (ThreadAbortException tae) | 201 | // } |
201 | { | 202 | // catch (ThreadAbortException tae) |
202 | string a = tae.ToString(); | 203 | // { |
203 | a = String.Empty; | 204 | // string a = tae.ToString(); |
204 | // Expected | 205 | // a = String.Empty; |
205 | } | 206 | // // Expected |
206 | } | 207 | // } |
208 | // } | ||
207 | 209 | ||
208 | public void DoScriptLoadUnload() | 210 | public void DoScriptLoadUnload() |
209 | { | 211 | { |
diff --git a/OpenSim/Region/ScriptEngine/Common/TRPC/TCPClient.cs b/OpenSim/Region/ScriptEngine/Common/TRPC/TCPClient.cs index 1187287..7689d69 100644 --- a/OpenSim/Region/ScriptEngine/Common/TRPC/TCPClient.cs +++ b/OpenSim/Region/ScriptEngine/Common/TRPC/TCPClient.cs | |||
@@ -74,12 +74,13 @@ namespace OpenSim.Region.ScriptEngine.Common.TRPC | |||
74 | Clients[ID].Disconnect(); | 74 | Clients[ID].Disconnect(); |
75 | } | 75 | } |
76 | 76 | ||
77 | void asyncConnected(IAsyncResult iar) | 77 | // TODO: unused |
78 | { | 78 | // void asyncConnected(IAsyncResult iar) |
79 | Socket client = (Socket)iar.AsyncState; | 79 | // { |
80 | client.EndConnect(iar); | 80 | // Socket client = (Socket)iar.AsyncState; |
81 | ProcessConnection(client); | 81 | // client.EndConnect(iar); |
82 | } | 82 | // ProcessConnection(client); |
83 | // } | ||
83 | 84 | ||
84 | private int ProcessConnection(Socket client) | 85 | private int ProcessConnection(Socket client) |
85 | { | 86 | { |