diff options
| author | Tedd Hansen | 2008-02-21 11:28:34 +0000 |
|---|---|---|
| committer | Tedd Hansen | 2008-02-21 11:28:34 +0000 |
| commit | 89665faeaff2ff62eaaddd0f111be8bcd7ca0297 (patch) | |
| tree | 12af17ba8a9b82b720a16ea2aa586531be1e4947 /OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueThreadClass.cs | |
| parent | "threads" command now works. I've added manual tracking of threads (only if c... (diff) | |
| download | opensim-SC_OLD-89665faeaff2ff62eaaddd0f111be8bcd7ca0297.zip opensim-SC_OLD-89665faeaff2ff62eaaddd0f111be8bcd7ca0297.tar.gz opensim-SC_OLD-89665faeaff2ff62eaaddd0f111be8bcd7ca0297.tar.bz2 opensim-SC_OLD-89665faeaff2ff62eaaddd0f111be8bcd7ca0297.tar.xz | |
ScriptEngine changes in locking. Another step in direction of shared threads.
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueThreadClass.cs')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueThreadClass.cs | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueThreadClass.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueThreadClass.cs index 6f96654..cf66e7a 100644 --- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueThreadClass.cs +++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueThreadClass.cs | |||
| @@ -200,7 +200,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase | |||
| 200 | //myScriptEngine.Log.Info("[" + ScriptEngineName + "]: Processing event for localID: " + QIS.localID + ", itemID: " + QIS.itemID + ", FunctionName: " + QIS.FunctionName); | 200 | //myScriptEngine.Log.Info("[" + ScriptEngineName + "]: Processing event for localID: " + QIS.localID + ", itemID: " + QIS.itemID + ", FunctionName: " + QIS.FunctionName); |
| 201 | 201 | ||
| 202 | // OBJECT BASED LOCK - TWO THREADS WORKING ON SAME OBJECT IS NOT GOOD | 202 | // OBJECT BASED LOCK - TWO THREADS WORKING ON SAME OBJECT IS NOT GOOD |
| 203 | lock (eventQueueManager.queueLock) | 203 | lock (eventQueueManager.eventQueue) |
| 204 | { | 204 | { |
| 205 | GotItem = false; | 205 | GotItem = false; |
| 206 | for (int qc = 0; qc < eventQueueManager.eventQueue.Count; qc++) | 206 | for (int qc = 0; qc < eventQueueManager.eventQueue.Count; qc++) |
| @@ -230,12 +230,12 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase | |||
| 230 | { | 230 | { |
| 231 | ///cfk 2-7-08 dont need this right now and the default Linux build has DEBUG defined | 231 | ///cfk 2-7-08 dont need this right now and the default Linux build has DEBUG defined |
| 232 | #if DEBUG | 232 | #if DEBUG |
| 233 | eventQueueManager.m_ScriptEngine.Log.Debug("[" + ScriptEngineName + "]: " + | 233 | //eventQueueManager.m_ScriptEngine.Log.Debug("[" + ScriptEngineName + "]: " + |
| 234 | "Executing event:\r\n" | 234 | // "Executing event:\r\n" |
| 235 | + "QIS.localID: " + QIS.localID | 235 | // + "QIS.localID: " + QIS.localID |
| 236 | + ", QIS.itemID: " + QIS.itemID | 236 | // + ", QIS.itemID: " + QIS.itemID |
| 237 | + ", QIS.functionName: " + | 237 | // + ", QIS.functionName: " + |
| 238 | QIS.functionName); | 238 | // QIS.functionName); |
| 239 | #endif | 239 | #endif |
| 240 | LastExecutionStarted = DateTime.Now.Ticks; | 240 | LastExecutionStarted = DateTime.Now.Ticks; |
| 241 | KillCurrentScript = false; | 241 | KillCurrentScript = false; |