aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueManager.cs17
1 files changed, 10 insertions, 7 deletions
diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueManager.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueManager.cs
index 3ba4618..7b10713 100644
--- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueManager.cs
+++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueManager.cs
@@ -70,15 +70,20 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase
70 /// <summary> 70 /// <summary>
71 /// List of threads (classes) processing event queue 71 /// List of threads (classes) processing event queue
72 /// </summary> 72 /// </summary>
73 internal List<EventQueueThreadClass> eventQueueThreads; 73 internal List<EventQueueThreadClass> eventQueueThreads; // Thread pool that we work on
74 /// <summary> 74 /// <summary>
75 /// Global static list of threads (classes) processing event queue -- used by max enforcment thread 75 /// Locking access to eventQueueThreads AND staticGlobalEventQueueThreads.
76 /// Note that this may or may not be a reference to a static object depending on PrivateRegionThreads config setting.
76 /// </summary> 77 /// </summary>
77 private List<EventQueueThreadClass> staticGlobalEventQueueThreads; 78 private object eventQueueThreadsLock;
79 // Static objects for referencing the objects above if we don't have private threads:
80 internal static List<EventQueueThreadClass> staticEventQueueThreads; // A static reference used if we don't use private threads
81 internal static object staticEventQueueThreadsLock; // Statick lock object reference for same reason
82
78 /// <summary> 83 /// <summary>
79 /// Locking access to eventQueueThreads AND staticGlobalEventQueueThreads. Note that this may or may not be static depending on PrivateRegionThreads config setting. 84 /// Global static list of all threads (classes) processing event queue -- used by max enforcment thread
80 /// </summary> 85 /// </summary>
81 private object eventQueueThreadsLock; 86 private List<EventQueueThreadClass> staticGlobalEventQueueThreads = new List<EventQueueThreadClass>();
82 87
83 /// <summary> 88 /// <summary>
84 /// Used internally to specify how many threads should exit gracefully 89 /// Used internally to specify how many threads should exit gracefully
@@ -86,8 +91,6 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase
86 public int ThreadsToExit; 91 public int ThreadsToExit;
87 public object ThreadsToExitLock = new object(); 92 public object ThreadsToExitLock = new object();
88 93
89 private static List<EventQueueThreadClass> staticEventQueueThreads;// = new List<EventQueueThreadClass>();
90 private static object staticEventQueueThreadsLock;// = new object();
91 94
92 public object queueLock = new object(); // Mutex lock object 95 public object queueLock = new object(); // Mutex lock object
93 96