diff options
author | John Hurliman | 2010-03-16 12:03:04 -0700 |
---|---|---|
committer | John Hurliman | 2010-03-16 12:03:04 -0700 |
commit | b51f40da8f24b78fa6101d70726ca2000e5b0341 (patch) | |
tree | 945d9a16dee81db24afd8284e9565d52408b68ec /OpenSim/Region | |
parent | Fixed several unhandled exceptions and performance issues with PrimitiveBaseS... (diff) | |
download | opensim-SC_OLD-b51f40da8f24b78fa6101d70726ca2000e5b0341.zip opensim-SC_OLD-b51f40da8f24b78fa6101d70726ca2000e5b0341.tar.gz opensim-SC_OLD-b51f40da8f24b78fa6101d70726ca2000e5b0341.tar.bz2 opensim-SC_OLD-b51f40da8f24b78fa6101d70726ca2000e5b0341.tar.xz |
Removed the unused use_async_when_possible config variable
Diffstat (limited to '')
-rwxr-xr-x | OpenSim/Region/Application/OpenSim.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 17 |
3 files changed, 2 insertions, 19 deletions
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs index 7e81650..38b2084 100755 --- a/OpenSim/Region/Application/OpenSim.cs +++ b/OpenSim/Region/Application/OpenSim.cs | |||
@@ -897,7 +897,7 @@ namespace OpenSim | |||
897 | { | 897 | { |
898 | connections.AppendFormat("{0}: {1} ({2}) from {3} on circuit {4}\n", | 898 | connections.AppendFormat("{0}: {1} ({2}) from {3} on circuit {4}\n", |
899 | scene.RegionInfo.RegionName, client.Name, client.AgentId, client.RemoteEndPoint, client.CircuitCode); | 899 | scene.RegionInfo.RegionName, client.Name, client.AgentId, client.RemoteEndPoint, client.CircuitCode); |
900 | }, false | 900 | } |
901 | ); | 901 | ); |
902 | } | 902 | } |
903 | ); | 903 | ); |
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs index 36d24e8..850474d 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs | |||
@@ -1020,7 +1020,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
1020 | 1020 | ||
1021 | // Handle outgoing packets, resends, acknowledgements, and pings for each | 1021 | // Handle outgoing packets, resends, acknowledgements, and pings for each |
1022 | // client. m_packetSent will be set to true if a packet is sent | 1022 | // client. m_packetSent will be set to true if a packet is sent |
1023 | m_scene.ForEachClient(clientPacketHandler, false); | 1023 | m_scene.ForEachClient(clientPacketHandler); |
1024 | 1024 | ||
1025 | // If nothing was sent, sleep for the minimum amount of time before a | 1025 | // If nothing was sent, sleep for the minimum amount of time before a |
1026 | // token bucket could get more tokens | 1026 | // token bucket could get more tokens |
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index c510dc8..baa8759 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -131,7 +131,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
131 | private readonly Timer m_restartTimer = new Timer(15000); // Wait before firing | 131 | private readonly Timer m_restartTimer = new Timer(15000); // Wait before firing |
132 | private int m_incrementsof15seconds; | 132 | private int m_incrementsof15seconds; |
133 | private volatile bool m_backingup; | 133 | private volatile bool m_backingup; |
134 | private bool m_useAsyncWhenPossible; | ||
135 | 134 | ||
136 | private Dictionary<UUID, ReturnInfo> m_returns = new Dictionary<UUID, ReturnInfo>(); | 135 | private Dictionary<UUID, ReturnInfo> m_returns = new Dictionary<UUID, ReturnInfo>(); |
137 | private Dictionary<UUID, SceneObjectGroup> m_groupsWithTargets = new Dictionary<UUID, SceneObjectGroup>(); | 136 | private Dictionary<UUID, SceneObjectGroup> m_groupsWithTargets = new Dictionary<UUID, SceneObjectGroup>(); |
@@ -654,9 +653,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
654 | // | 653 | // |
655 | IConfig startupConfig = m_config.Configs["Startup"]; | 654 | IConfig startupConfig = m_config.Configs["Startup"]; |
656 | 655 | ||
657 | // Should we try to run loops synchronously or asynchronously? | ||
658 | m_useAsyncWhenPossible = startupConfig.GetBoolean("use_async_when_possible", false); | ||
659 | |||
660 | //Animation states | 656 | //Animation states |
661 | m_useFlySlow = startupConfig.GetBoolean("enableflyslow", false); | 657 | m_useFlySlow = startupConfig.GetBoolean("enableflyslow", false); |
662 | // TODO: Change default to true once the feature is supported | 658 | // TODO: Change default to true once the feature is supported |
@@ -4289,20 +4285,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
4289 | 4285 | ||
4290 | public void ForEachClient(Action<IClientAPI> action) | 4286 | public void ForEachClient(Action<IClientAPI> action) |
4291 | { | 4287 | { |
4292 | ForEachClient(action, m_useAsyncWhenPossible); | ||
4293 | } | ||
4294 | |||
4295 | public void ForEachClient(Action<IClientAPI> action, bool doAsynchronous) | ||
4296 | { | ||
4297 | // FIXME: Asynchronous iteration is disabled until we have a threading model that | ||
4298 | // can support calling this function from an async packet handler without | ||
4299 | // potentially deadlocking | ||
4300 | m_clientManager.ForEachSync(action); | 4288 | m_clientManager.ForEachSync(action); |
4301 | |||
4302 | //if (doAsynchronous) | ||
4303 | // m_clientManager.ForEach(action); | ||
4304 | //else | ||
4305 | // m_clientManager.ForEachSync(action); | ||
4306 | } | 4289 | } |
4307 | 4290 | ||
4308 | public bool TryGetClient(UUID avatarID, out IClientAPI client) | 4291 | public bool TryGetClient(UUID avatarID, out IClientAPI client) |