Improve liveness by operating on list copies of SOG.Children where appropriate

OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs

@@ -349,7 +349,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
         public void TestLoadIarPathStartsWithSlash()
         {
             TestHelper.InMethod();            
-            log4net.Config.XmlConfigurator.Configure();
+//            log4net.Config.XmlConfigurator.Configure();
             
             SerialiserModule serialiserModule = new SerialiserModule();
             InventoryArchiverModule archiverModule = new InventoryArchiverModule(true);           

OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs

@@ -243,9 +243,11 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                 // to the same scene (when this is possible).
                 sceneObject.ResetIDs();
 
+                List<SceneObjectPart> partList = null;
                 lock (sceneObject.Children)
-                {
+                    partList = new List<SceneObjectPart>(sceneObject.Children.Values);
-                    foreach (SceneObjectPart part in sceneObject.Children.Values)
+                
+                foreach (SceneObjectPart part in partList)
                 {
                     if (!ResolveUserUuid(part.CreatorID))
                         part.CreatorID = m_scene.RegionInfo.EstateSettings.EstateOwner;
@@ -279,7 +281,6 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                         }
                     }
                 }
-                }
 
                 if (m_scene.AddRestoredSceneObject(sceneObject, true, false))
                 {

OpenSim/Region/CoreModules/World/WorldMap/MapImageModule.cs

@@ -229,9 +229,11 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
                         Color mapdotspot = Color.Gray; // Default color when prim color is white
                         
                         // Loop over prim in group                            
+                        List<SceneObjectPart> partList = null;
                         lock (mapdot.Children)
-                        {
+                            partList = new List<SceneObjectPart>(mapdot.Children.Values);
-                            foreach (SceneObjectPart part in mapdot.Children.Values)
+                            
+                        foreach (SceneObjectPart part in partList)
                         {
                             if (part == null)
                                 continue;
@@ -501,7 +503,6 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
                                     //}
                                 } // Object is within 256m Z of terrain
                             } // object is at least a meter wide
-                            } // mapdot.Children lock
                         } // loop over group children
                     } // entitybase is sceneobject group
                 } // foreach loop over entities

OpenSim/Region/Framework/Scenes/Scene.Inventory.cs

@@ -2004,12 +2004,13 @@ namespace OpenSim.Region.Framework.Scenes
                     sog.SetGroup(groupID, remoteClient);
                     sog.ScheduleGroupForFullUpdate();
 
+                    List<SceneObjectPart> partList = null;
                     lock (sog.Children)
-                    {
+                        partList = new List<SceneObjectPart>(sog.Children.Values);                    
-                        foreach (SceneObjectPart child in sog.Children.Values)
+                    
+                    foreach (SceneObjectPart child in partList)
                         child.Inventory.ChangeInventoryOwner(ownerID);
                 }
-                }
                 else
                 {
                     if (!Permissions.CanEditObject(sog.UUID, remoteClient.AgentId))
@@ -2018,14 +2019,15 @@ namespace OpenSim.Region.Framework.Scenes
                     if (sog.GroupID != groupID)
                         continue;
                     
+                    List<SceneObjectPart> partList = null;
                     lock (sog.Children)
-                    {
+                        partList = new List<SceneObjectPart>(sog.Children.Values);                    
-                        foreach (SceneObjectPart child in sog.Children.Values)
+
+                    foreach (SceneObjectPart child in partList)
                     {
                         child.LastOwnerID = child.OwnerID;
                         child.Inventory.ChangeInventoryOwner(groupID);
                     }
-                    }
 
                     sog.SetOwnerId(groupID);
                     sog.ApplyNextOwnerPermissions();

OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs

@@ -164,18 +164,19 @@ namespace OpenSim.Region.Framework.Scenes
                         
                         SceneObjectGroup sog = ent as SceneObjectGroup;
                         
+                        List<SceneObjectPart> partList = null;
                         lock (sog.Children)
+                            partList = new List<SceneObjectPart>(sog.Children.Values);    
+
+                        foreach (SceneObjectPart part in partList)
                         {
-                            foreach (KeyValuePair<UUID, SceneObjectPart> child in (sog.Children))
+                            if (part.LocalId == primLocalID) 
                             {
-                                if (child.Value.LocalId == primLocalID) 
+                                part.GetProperties(remoteClient);
-                                {
-                                    child.Value.GetProperties(remoteClient);
                                 foundPrim = true;
                                 break;
                             }
                         }
-                        }
                             
                         if (foundPrim) 
                             break;

OpenSim/Region/Framework/Scenes/Scene.cs

@@ -2065,9 +2065,11 @@ namespace OpenSim.Region.Framework.Scenes
                 group.RemoveScriptInstances(true);
             }
 
+            List<SceneObjectPart> partList = null;
             lock (group.Children)
-            {
+                partList = new List<SceneObjectPart>(group.Children.Values);
-                foreach (SceneObjectPart part in group.Children.Values)
+
+            foreach (SceneObjectPart part in partList)
             {
                 if (part.IsJoint() && ((part.Flags & PrimFlags.Physics) != 0))
                 {
@@ -2079,7 +2081,6 @@ namespace OpenSim.Region.Framework.Scenes
                     part.PhysActor = null;
                 }
             }
-            }
             
 //            if (rootPart.PhysActor != null)
 //            {

OpenSim/Region/Framework/Scenes/SceneGraph.cs

@@ -381,13 +381,15 @@ namespace OpenSim.Region.Framework.Scenes
                         }
                     }
                     
+                    m_numPrim += sceneObject.Children.Count;
+                }
+        
                 sceneObject.AttachToScene(m_parentScene);
 
                 if (sendClientUpdates)
                     sceneObject.ScheduleGroupForFullUpdate();
                                  
                 Entities.Add(sceneObject);                    
-                    m_numPrim += sceneObject.Children.Count;
 
                 if (attachToBackup)
                     sceneObject.AttachToBackup();
@@ -409,7 +411,6 @@ namespace OpenSim.Region.Framework.Scenes
                         SceneObjectGroupsByLocalID[part.LocalId] = sceneObject;
                 }
             }
-            }
 
             return true;
         }

OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs

@@ -237,6 +237,8 @@ namespace OpenSim.Region.Framework.Scenes
 
         /// <value>
         /// The parts of this scene object group.  You must lock this property before using it.
+        /// If you're doing anything other than reading values, please take a copy of the values rather than locking
+        /// the dictionary for the entirety of the operation.  This increases liveness and reduces the danger of deadlock
         /// If you want to know the number of children, consider using the PrimCount property instead
         /// </value>
         public Dictionary<UUID, SceneObjectPart> Children
@@ -1968,8 +1970,6 @@ namespace OpenSim.Region.Framework.Scenes
             //if ((RootPart.Flags & PrimFlags.TemporaryOnRez) != 0)
             //    return;
 
-            lock (m_parts)
-            {
             bool UsePhysics = ((RootPart.Flags & PrimFlags.Physics) != 0);
 
             if (UsePhysics && !AbsolutePosition.ApproxEquals(lastPhysGroupPos, 0.02f))
@@ -1984,14 +1984,17 @@ namespace OpenSim.Region.Framework.Scenes
                 lastPhysGroupRot = GroupRotation;
             }
 
-                foreach (SceneObjectPart part in m_parts.Values)
+            List<SceneObjectPart> partList = null;
+            lock (m_parts)
+                partList = new List<SceneObjectPart>(m_parts.Values);
+                
+            foreach (SceneObjectPart part in partList)
             {
                 if (!IsSelected)
                     part.UpdateLookAt();
                 part.SendScheduledUpdates();
             }
         }
-        }
 
         public void ScheduleFullUpdateToAvatar(ScenePresence presence)
         {
@@ -2787,11 +2790,12 @@ namespace OpenSim.Region.Framework.Scenes
         public void UpdatePermissions(UUID AgentID, byte field, uint localID,
                 uint mask, byte addRemTF)
         {
+            List<SceneObjectPart> partList = null;
             lock (m_parts)
-            {
+                partList = new List<SceneObjectPart>(m_parts.Values);
-                foreach (SceneObjectPart part in m_parts.Values)
+
+            foreach (SceneObjectPart part in partList)
                 part.UpdatePermissions(AgentID, field, localID, mask, addRemTF);
-            }
 
             HasGroupChanged = true;
         }

OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObject.cs

@@ -187,17 +187,19 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
                 SceneObjectPart my = GetSOP();
                 IObject[] rets = null;
 
-                lock (my.ParentGroup.Children)
+                int total = my.ParentGroup.PrimCount;
-                {
-                    int total = my.ParentGroup.Children.Count;
 
                 rets = new IObject[total];
 
                 int i = 0;
-                    foreach (KeyValuePair<UUID, SceneObjectPart> pair in my.ParentGroup.Children)
+                    
+                List<SceneObjectPart> partList = null;
+                lock (my.ParentGroup.Children)
+                    partList = new List<SceneObjectPart>(my.ParentGroup.Children.Values);
+                    
+                foreach (SceneObjectPart part in partList)
                 {
-                        rets[i++] = new SOPObject(m_rootScene, pair.Value.LocalId, m_security);
+                    rets[i++] = new SOPObject(m_rootScene, part.LocalId, m_security);
-                    }
                 }
 
                 return rets;