Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor

5 files changed, 65 insertions, 13 deletions

diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
index 41e41e4..d9aecd8 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
@@ -909,7 +909,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 client.OnLogout += LogoutHandler;
 
                 // Start the IClientAPI
-                client.Start();
+                // Spin it off so that it doesn't clog up the LLUDPServer
+                Util.FireAndForget(delegate(object o) { client.Start(); });
             }
             else
             {
diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
index 5dc9c44..5339dee 100644
--- a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
@@ -201,9 +201,10 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
 
             UserFriendData data = m_Friends[principalID];
 
+            string searchFor = friendID.ToString();
             foreach (FriendInfo fi in data.Friends)
             {
-                if (fi.Friend == friendID.ToString())
+                if (fi.Friend == searchFor)
                     return (uint)fi.TheirFlags;
             }
             return 0;
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
index f43de20..c16ba12 100644
--- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
@@ -70,6 +70,9 @@ namespace OpenSim.Region.Framework.Scenes
 
         protected Dictionary<UUID, ScenePresence> m_scenePresences = new Dictionary<UUID, ScenePresence>();
         protected ScenePresence[] m_scenePresenceArray = new ScenePresence[0];
+        protected List<ScenePresence> m_scenePresenceList = new List<ScenePresence>();
+
+        protected OpenMetaverse.ReaderWriterLockSlim m_scenePresencesLock = new OpenMetaverse.ReaderWriterLockSlim();
 
         // SceneObjects is not currently populated or used.
         //public Dictionary<UUID, SceneObjectGroup> SceneObjects;
@@ -132,10 +135,16 @@ namespace OpenSim.Region.Framework.Scenes
 
         protected internal void Close()
         {
-            lock (m_scenePresences)
+            m_scenePresencesLock.EnterWriteLock();
+            try
             {
                 m_scenePresences.Clear();
                 m_scenePresenceArray = new ScenePresence[0];
+                m_scenePresenceList = new List<ScenePresence>();
+            }
+            finally
+            {
+                m_scenePresencesLock.ExitWriteLock();
             }
 
             lock (m_dictionary_lock)
@@ -542,7 +551,8 @@ namespace OpenSim.Region.Framework.Scenes
 
             Entities[presence.UUID] = presence;
 
-            lock (m_scenePresences)
+            m_scenePresencesLock.EnterWriteLock();
+            try
             {
                 if (!m_scenePresences.ContainsKey(presence.UUID))
                 {
@@ -554,11 +564,12 @@ namespace OpenSim.Region.Framework.Scenes
                     Array.Copy(m_scenePresenceArray, newArray, oldLength);
                     newArray[oldLength] = presence;
                     m_scenePresenceArray = newArray;
+                    m_scenePresenceList = new List<ScenePresence>(m_scenePresenceArray);
                 }
                 else
                 {
                     m_scenePresences[presence.UUID] = presence;
-                    
+
                     // Do a linear search through the array of ScenePresence references
                     // and update the modified entry
                     for (int i = 0; i < m_scenePresenceArray.Length; i++)
@@ -569,8 +580,13 @@ namespace OpenSim.Region.Framework.Scenes
                             break;
                         }
                     }
+                    m_scenePresenceList = new List<ScenePresence>(m_scenePresenceArray);
                 }
             }
+            finally
+            {
+                m_scenePresencesLock.ExitWriteLock();
+            }
         }
 
         /// <summary>
@@ -585,7 +601,8 @@ namespace OpenSim.Region.Framework.Scenes
                     agentID);
             }
 
-            lock (m_scenePresences)
+            m_scenePresencesLock.EnterWriteLock();
+            try
             {
                 if (m_scenePresences.Remove(agentID))
                 {
@@ -604,12 +621,17 @@ namespace OpenSim.Region.Framework.Scenes
                         }
                     }
                     m_scenePresenceArray = newArray;
+                    m_scenePresenceList = new List<ScenePresence>(m_scenePresenceArray);
                 }
                 else
                 {
                     m_log.WarnFormat("[SCENE] Tried to remove non-existent scene presence with agent ID {0} from scene ScenePresences list", agentID);
                 }
             }
+            finally
+            {
+                m_scenePresencesLock.ExitWriteLock();
+            }
         }
 
         protected internal void SwapRootChildAgent(bool direction_RC_CR_T_F)
@@ -730,8 +752,15 @@ namespace OpenSim.Region.Framework.Scenes
         /// <returns></returns>
         private List<ScenePresence> GetScenePresences()
         {
-            lock (m_scenePresences)
-                return new List<ScenePresence>(m_scenePresenceArray);
+            m_scenePresencesLock.EnterReadLock();
+            try
+            {
+                return m_scenePresenceList;
+            }
+            finally
+            {
+                m_scenePresencesLock.ExitReadLock();
+            }
         }
 
         /// <summary>
@@ -742,10 +771,15 @@ namespace OpenSim.Region.Framework.Scenes
         protected internal ScenePresence GetScenePresence(UUID agentID)
         {
             ScenePresence sp;
-            lock (m_scenePresences)
+            m_scenePresencesLock.EnterReadLock();
+            try
             {
                 m_scenePresences.TryGetValue(agentID, out sp);
             }
+            finally
+            {
+                m_scenePresencesLock.ExitReadLock();
+            }
             return sp;
         }
 
@@ -780,10 +814,15 @@ namespace OpenSim.Region.Framework.Scenes
 
         protected internal bool TryGetScenePresence(UUID agentID, out ScenePresence avatar)
         {
-            lock (m_scenePresences)
+            m_scenePresencesLock.EnterReadLock();
+            try
             {
                 m_scenePresences.TryGetValue(agentID, out avatar);
             }
+            finally
+            {
+                m_scenePresencesLock.ExitReadLock();
+            }
             return (avatar != null);
         }
 
@@ -1061,6 +1100,7 @@ namespace OpenSim.Region.Framework.Scenes
             Parallel.ForEach<ScenePresence>(GetScenePresences(), protectedAction);
             */
             // For now, perform actiona serially
+            
             foreach (ScenePresence sp in GetScenePresences())
             {
                 try
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 35134d6..a4b8944 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -3651,7 +3651,8 @@ namespace OpenSim.Region.Framework.Scenes
                     if (atRotTargets.Count > 0)
                     {
                         uint[] localids = new uint[0];
-                        lock (m_parts)
+                        lockPartsForRead(true);
+                        try
                         {
                             localids = new uint[m_parts.Count];
                             int cntr = 0;
@@ -3661,6 +3662,10 @@ namespace OpenSim.Region.Framework.Scenes
                                 cntr++;
                             }
                         }
+                        finally
+                        {
+                            lockPartsForRead(false);
+                        }
 
                         for (int ctr = 0; ctr < localids.Length; ctr++)
                         {
@@ -3679,7 +3684,8 @@ namespace OpenSim.Region.Framework.Scenes
                     {
                         //trigger not_at_target
                         uint[] localids = new uint[0];
-                        lock (m_parts)
+                        lockPartsForRead(true);
+                        try
                         {
                             localids = new uint[m_parts.Count];
                             int cntr = 0;
@@ -3689,6 +3695,10 @@ namespace OpenSim.Region.Framework.Scenes
                                 cntr++;
                             }
                         }
+                        finally
+                        {
+                            lockPartsForRead(false);
+                        }
 
                         for (int ctr = 0; ctr < localids.Length; ctr++)
                         {
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
index 62b44bd..c4cff12 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
@@ -840,12 +840,12 @@ namespace OpenSim.Region.Framework.Scenes
             }
             else
             {
+                m_items.LockItemsForRead(false);
                 m_log.ErrorFormat(
                     "[PRIM INVENTORY]: " +
                     "Tried to remove item ID {0} from prim {1}, {2} but the item does not exist in this inventory",
                     itemID, m_part.Name, m_part.UUID);
             }
-            m_items.LockItemsForWrite(false);
 
             return -1;
         }