diff options
author | John Hurliman | 2009-10-26 16:33:04 -0700 |
---|---|---|
committer | John Hurliman | 2009-10-26 16:33:04 -0700 |
commit | 4847e62e9fd1cd473cc180220a379efba93f94a6 (patch) | |
tree | 509da282d16f1cfa7d2500debc5b56c48799ec98 /OpenSim/Region/Framework/Scenes/Scene.cs | |
parent | Added calls to GC.AddMemoryPressure() when unmanaged memory is allocated for ... (diff) | |
download | opensim-SC_OLD-4847e62e9fd1cd473cc180220a379efba93f94a6.zip opensim-SC_OLD-4847e62e9fd1cd473cc180220a379efba93f94a6.tar.gz opensim-SC_OLD-4847e62e9fd1cd473cc180220a379efba93f94a6.tar.bz2 opensim-SC_OLD-4847e62e9fd1cd473cc180220a379efba93f94a6.tar.xz |
* Switched all operations on the list of clients that could be either sync or async to use Scene.ForEachClient() instead of referencing ClientManager directly
* Added a new [Startup] config option called use_async_when_possible to signal how to run operations that could be either sync or async
* Changed Scene.ForEachClient to respect use_async_when_possible
* Fixing a potential deadlock in Parallel.ForEach by locking on a temporary object instead of the enumerator (which may be shared across multiple invocations on ForEach). Thank you diva
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 48 |
1 files changed, 27 insertions, 21 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 4776bed..91367db 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -106,11 +106,11 @@ namespace OpenSim.Region.Framework.Scenes | |||
106 | public bool m_physicalPrim; | 106 | public bool m_physicalPrim; |
107 | public float m_maxNonphys = 256; | 107 | public float m_maxNonphys = 256; |
108 | public float m_maxPhys = 10; | 108 | public float m_maxPhys = 10; |
109 | public bool m_clampPrimSize = false; | 109 | public bool m_clampPrimSize; |
110 | public bool m_trustBinaries = false; | 110 | public bool m_trustBinaries; |
111 | public bool m_allowScriptCrossings = false; | 111 | public bool m_allowScriptCrossings; |
112 | public bool m_useFlySlow = false; | 112 | public bool m_useFlySlow; |
113 | public bool m_usePreJump = false; | 113 | public bool m_usePreJump; |
114 | public bool m_seeIntoRegionFromNeighbor; | 114 | public bool m_seeIntoRegionFromNeighbor; |
115 | // TODO: need to figure out how allow client agents but deny | 115 | // TODO: need to figure out how allow client agents but deny |
116 | // root agents when ACL denies access to root agent | 116 | // root agents when ACL denies access to root agent |
@@ -118,11 +118,11 @@ namespace OpenSim.Region.Framework.Scenes | |||
118 | public int MaxUndoCount = 5; | 118 | public int MaxUndoCount = 5; |
119 | private int m_RestartTimerCounter; | 119 | private int m_RestartTimerCounter; |
120 | private readonly Timer m_restartTimer = new Timer(15000); // Wait before firing | 120 | private readonly Timer m_restartTimer = new Timer(15000); // Wait before firing |
121 | private int m_incrementsof15seconds = 0; | 121 | private int m_incrementsof15seconds; |
122 | private volatile bool m_backingup = false; | 122 | private volatile bool m_backingup; |
123 | private bool m_useAsyncWhenPossible = true; | ||
123 | 124 | ||
124 | private Dictionary<UUID, ReturnInfo> m_returns = new Dictionary<UUID, ReturnInfo>(); | 125 | private Dictionary<UUID, ReturnInfo> m_returns = new Dictionary<UUID, ReturnInfo>(); |
125 | |||
126 | private Dictionary<UUID, SceneObjectGroup> m_groupsWithTargets = new Dictionary<UUID, SceneObjectGroup>(); | 126 | private Dictionary<UUID, SceneObjectGroup> m_groupsWithTargets = new Dictionary<UUID, SceneObjectGroup>(); |
127 | 127 | ||
128 | protected string m_simulatorVersion = "OpenSimulator Server"; | 128 | protected string m_simulatorVersion = "OpenSimulator Server"; |
@@ -142,8 +142,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
142 | 142 | ||
143 | public IXfer XferManager; | 143 | public IXfer XferManager; |
144 | 144 | ||
145 | protected IAssetService m_AssetService = null; | 145 | protected IAssetService m_AssetService; |
146 | protected IAuthorizationService m_AuthorizationService = null; | 146 | protected IAuthorizationService m_AuthorizationService; |
147 | 147 | ||
148 | private Object m_heartbeatLock = new Object(); | 148 | private Object m_heartbeatLock = new Object(); |
149 | 149 | ||
@@ -184,7 +184,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
184 | } | 184 | } |
185 | } | 185 | } |
186 | 186 | ||
187 | protected IInventoryService m_InventoryService = null; | 187 | protected IInventoryService m_InventoryService; |
188 | 188 | ||
189 | public IInventoryService InventoryService | 189 | public IInventoryService InventoryService |
190 | { | 190 | { |
@@ -204,7 +204,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
204 | } | 204 | } |
205 | } | 205 | } |
206 | 206 | ||
207 | protected IGridService m_GridService = null; | 207 | protected IGridService m_GridService; |
208 | 208 | ||
209 | public IGridService GridService | 209 | public IGridService GridService |
210 | { | 210 | { |
@@ -252,7 +252,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
252 | // Central Update Loop | 252 | // Central Update Loop |
253 | 253 | ||
254 | protected int m_fps = 10; | 254 | protected int m_fps = 10; |
255 | protected int m_frame = 0; | 255 | protected int m_frame; |
256 | protected float m_timespan = 0.089f; | 256 | protected float m_timespan = 0.089f; |
257 | protected DateTime m_lastupdate = DateTime.UtcNow; | 257 | protected DateTime m_lastupdate = DateTime.UtcNow; |
258 | 258 | ||
@@ -265,17 +265,17 @@ namespace OpenSim.Region.Framework.Scenes | |||
265 | private int m_update_terrain = 50; | 265 | private int m_update_terrain = 50; |
266 | private int m_update_land = 1; | 266 | private int m_update_land = 1; |
267 | 267 | ||
268 | private int frameMS = 0; | 268 | private int frameMS; |
269 | private int physicsMS2 = 0; | 269 | private int physicsMS2; |
270 | private int physicsMS = 0; | 270 | private int physicsMS; |
271 | private int otherMS = 0; | 271 | private int otherMS; |
272 | 272 | ||
273 | private bool m_physics_enabled = true; | 273 | private bool m_physics_enabled = true; |
274 | private bool m_scripts_enabled = true; | 274 | private bool m_scripts_enabled = true; |
275 | private string m_defaultScriptEngine; | 275 | private string m_defaultScriptEngine; |
276 | private int m_LastLogin = 0; | 276 | private int m_LastLogin; |
277 | private Thread HeartbeatThread = null; | 277 | private Thread HeartbeatThread; |
278 | private volatile bool shuttingdown = false; | 278 | private volatile bool shuttingdown; |
279 | 279 | ||
280 | private int m_lastUpdate = Environment.TickCount; | 280 | private int m_lastUpdate = Environment.TickCount; |
281 | private bool m_firstHeartbeat = true; | 281 | private bool m_firstHeartbeat = true; |
@@ -479,6 +479,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
479 | // | 479 | // |
480 | IConfig startupConfig = m_config.Configs["Startup"]; | 480 | IConfig startupConfig = m_config.Configs["Startup"]; |
481 | 481 | ||
482 | // Should we try to run loops synchronously or asynchronously? | ||
483 | m_useAsyncWhenPossible = startupConfig.GetBoolean("use_async_when_possible", true); | ||
484 | |||
482 | //Animation states | 485 | //Animation states |
483 | m_useFlySlow = startupConfig.GetBoolean("enableflyslow", false); | 486 | m_useFlySlow = startupConfig.GetBoolean("enableflyslow", false); |
484 | // TODO: Change default to true once the feature is supported | 487 | // TODO: Change default to true once the feature is supported |
@@ -4253,7 +4256,10 @@ namespace OpenSim.Region.Framework.Scenes | |||
4253 | 4256 | ||
4254 | public void ForEachClient(Action<IClientAPI> action) | 4257 | public void ForEachClient(Action<IClientAPI> action) |
4255 | { | 4258 | { |
4256 | ClientManager.ForEachSync(action); | 4259 | if (m_useAsyncWhenPossible) |
4260 | ClientManager.ForEach(action); | ||
4261 | else | ||
4262 | ClientManager.ForEachSync(action); | ||
4257 | } | 4263 | } |
4258 | 4264 | ||
4259 | public void ForEachSOG(Action<SceneObjectGroup> action) | 4265 | public void ForEachSOG(Action<SceneObjectGroup> action) |