From 89d23a1fa23cb191e7ebde047311adcadf3b2e45 Mon Sep 17 00:00:00 2001 From: Melanie Date: Wed, 7 Oct 2009 01:45:49 +0100 Subject: Revert "Rewrote parts of the code that were double-locking different objects. This is about half of the code base reviewed." This reverts commit e992ca025571a891333a57012c2cd4419b6581e5. --- .../CoreModules/Avatar/Friends/FriendsModule.cs | 42 ++++++++++------------ .../Avatar/InstantMessage/PresenceModule.cs | 11 +++--- .../Inventory/Transfer/InventoryTransferModule.cs | 15 ++++---- .../Scripting/EMailModules/EmailModule.cs | 37 ++++++++++--------- .../CoreModules/World/Land/LandManagementModule.cs | 8 ++--- 5 files changed, 51 insertions(+), 62 deletions(-) (limited to 'OpenSim/Region/CoreModules') diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs index 4abad81..fc7d63a 100644 --- a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs @@ -442,46 +442,42 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends private ScenePresence GetRootPresenceFromAgentID(UUID AgentID) { - List scenes = null; - lock (m_scenes) - scenes = new List(m_scenes.Values); - ScenePresence returnAgent = null; - ScenePresence queryagent = null; - foreach (Scene scene in scenes) + lock (m_scenes) { - queryagent = scene.GetScenePresence(AgentID); - if (queryagent != null) + ScenePresence queryagent = null; + foreach (Scene scene in m_scenes.Values) { - if (!queryagent.IsChildAgent) + queryagent = scene.GetScenePresence(AgentID); + if (queryagent != null) { - returnAgent = queryagent; - break; + if (!queryagent.IsChildAgent) + { + returnAgent = queryagent; + break; + } } } } - return returnAgent; } private ScenePresence GetAnyPresenceFromAgentID(UUID AgentID) { - List scenes = null; - lock (m_scenes) - scenes = new List(m_scenes.Values); - ScenePresence returnAgent = null; - ScenePresence queryagent = null; - foreach (Scene scene in m_scenes.Values) + lock (m_scenes) { - queryagent = scene.GetScenePresence(AgentID); - if (queryagent != null) + ScenePresence queryagent = null; + foreach (Scene scene in m_scenes.Values) { - returnAgent = queryagent; - break; + queryagent = scene.GetScenePresence(AgentID); + if (queryagent != null) + { + returnAgent = queryagent; + break; + } } } - return returnAgent; } diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/PresenceModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/PresenceModule.cs index 42dd7ff..ad05bab 100644 --- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/PresenceModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/PresenceModule.cs @@ -290,14 +290,13 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage // get the agent. This should work every time, as we just got a packet from it ScenePresence agent = null; - List scenes = null; lock (m_Scenes) - scenes = new List(m_Scenes); - - foreach (Scene scene in scenes) { - agent = scene.GetScenePresence(agentID); - if (agent != null) break; + foreach (Scene scene in m_Scenes) + { + agent = scene.GetScenePresence(agentID); + if (agent != null) break; + } } // just to be paranoid... diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs index e6e0483..d9a021f 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs @@ -111,17 +111,16 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer private Scene FindClientScene(UUID agentId) { - List scenes = null; lock (m_Scenelist) - scenes = new List(m_Scenelist); - - foreach (Scene scene in scenes) { - ScenePresence presence = scene.GetScenePresence(agentId); - if (presence != null) + foreach (Scene scene in m_Scenelist) { - if (!presence.IsChildAgent) - return scene; + ScenePresence presence = scene.GetScenePresence(agentId); + if (presence != null) + { + if (!presence.IsChildAgent) + return scene; + } } } return null; diff --git a/OpenSim/Region/CoreModules/Scripting/EMailModules/EmailModule.cs b/OpenSim/Region/CoreModules/Scripting/EMailModules/EmailModule.cs index f9f01fe..83f004d 100644 --- a/OpenSim/Region/CoreModules/Scripting/EMailModules/EmailModule.cs +++ b/OpenSim/Region/CoreModules/Scripting/EMailModules/EmailModule.cs @@ -198,20 +198,19 @@ namespace OpenSim.Region.CoreModules.Scripting.EmailModules private SceneObjectPart findPrim(UUID objectID, out string ObjectRegionName) { - List scenes = null; lock (m_Scenes) - scenes = new List(m_Scenes.Values); - - foreach (Scene s in scenes) { - SceneObjectPart part = s.GetSceneObjectPart(objectID); - if (part != null) + foreach (Scene s in m_Scenes.Values) { - ObjectRegionName = s.RegionInfo.RegionName; - uint localX = (s.RegionInfo.RegionLocX * (int)Constants.RegionSize); - uint localY = (s.RegionInfo.RegionLocY * (int)Constants.RegionSize); - ObjectRegionName = ObjectRegionName + " (" + localX + ", " + localY + ")"; - return part; + SceneObjectPart part = s.GetSceneObjectPart(objectID); + if (part != null) + { + ObjectRegionName = s.RegionInfo.RegionName; + uint localX = (s.RegionInfo.RegionLocX * (int)Constants.RegionSize); + uint localY = (s.RegionInfo.RegionLocY * (int)Constants.RegionSize); + ObjectRegionName = ObjectRegionName + " (" + localX + ", " + localY + ")"; + return part; + } } } ObjectRegionName = string.Empty; @@ -364,7 +363,6 @@ namespace OpenSim.Region.CoreModules.Scripting.EmailModules public Email GetNextEmail(UUID objectID, string sender, string subject) { List queue = null; - List removal = new List(); lock (m_LastGetEmailCall) { @@ -377,6 +375,7 @@ namespace OpenSim.Region.CoreModules.Scripting.EmailModules // Hopefully this isn't too time consuming. If it is, we can always push it into a worker thread. DateTime now = DateTime.Now; + List removal = new List(); foreach (UUID uuid in m_LastGetEmailCall.Keys) { if ((now - m_LastGetEmailCall[uuid]) > m_QueueTimeout) @@ -384,15 +383,15 @@ namespace OpenSim.Region.CoreModules.Scripting.EmailModules removal.Add(uuid); } } - } - foreach (UUID remove in removal) - { - lock (m_LastGetEmailCall) + foreach (UUID remove in removal) + { m_LastGetEmailCall.Remove(remove); - - lock (m_MailQueues) - m_MailQueues.Remove(remove); + lock (m_MailQueues) + { + m_MailQueues.Remove(remove); + } + } } lock (m_MailQueues) diff --git a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs index 0fed1bd..d2b5cb1 100644 --- a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs +++ b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs @@ -187,16 +187,14 @@ namespace OpenSim.Region.CoreModules.World.Land LandData newData = data.Copy(); newData.LocalID = local_id; - ILandObject land = null; lock (m_landList) { if (m_landList.ContainsKey(local_id)) { m_landList[local_id].LandData = newData; - land = m_landList[local_id]; + m_scene.EventManager.TriggerLandObjectUpdated((uint)local_id, m_landList[local_id]); } } - m_scene.EventManager.TriggerLandObjectUpdated((uint)local_id, land); } public bool AllowedForcefulBans @@ -506,7 +504,6 @@ namespace OpenSim.Region.CoreModules.World.Land /// Land.localID of the peice of land to remove. public void removeLandObject(int local_id) { - UUID id = UUID.Zero; lock (m_landList) { for (int x = 0; x < 64; x++) @@ -523,10 +520,9 @@ namespace OpenSim.Region.CoreModules.World.Land } } - id = m_landList[local_id].LandData.GlobalID; + m_scene.EventManager.TriggerLandObjectRemoved(m_landList[local_id].LandData.GlobalID); m_landList.Remove(local_id); } - m_scene.EventManager.TriggerLandObjectRemoved(id); } private void performFinalLandJoin(ILandObject master, ILandObject slave) -- cgit v1.1