From 588361e2a2398b963871762c2b5485c6a086cf47 Mon Sep 17 00:00:00 2001
From: John Hurliman
Date: Fri, 23 Oct 2009 01:02:36 -0700
Subject: Experimental change to use an immutable array for iterating
 ScenePresences, avoiding locking and copying the list each time it is
 accessed

---
 .../Region/CoreModules/Avatar/Combat/CombatModule.cs    |  8 +++++---
 .../Region/CoreModules/Avatar/Dialog/DialogModule.cs    | 17 +++++++++++------
 .../CoreModules/World/Estate/EstateManagementModule.cs  |  7 +++++--
 3 files changed, 21 insertions(+), 11 deletions(-)

(limited to 'OpenSim/Region/CoreModules')

diff --git a/OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs b/OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs
index 9387bce..61b6d65 100644
--- a/OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs
@@ -96,12 +96,14 @@ namespace OpenSim.Region.CoreModules.Avatar.Combat.CombatModule
             else
             {
                 bool foundResult = false;
-                string resultstring = "";
-                List<ScenePresence> allav = DeadAvatar.Scene.GetScenePresences();
+                string resultstring = String.Empty;
+                ScenePresence[] allav = DeadAvatar.Scene.GetScenePresences();
                 try
                 {
-                    foreach (ScenePresence av in allav)
+                    for (int i = 0; i < allav.Length; i++)
                     {
+                        ScenePresence av = allav[i];
+
                         if (av.LocalId == killerObjectLocalID)
                         {
                             av.ControllingClient.SendAlertMessage("You fragged " + DeadAvatar.Firstname + " " + DeadAvatar.Lastname);
diff --git a/OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs b/OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs
index ebebaf9..72ec869 100644
--- a/OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs
@@ -85,10 +85,12 @@ namespace OpenSim.Region.CoreModules.Avatar.Dialog
         
         public void SendAlertToUser(string firstName, string lastName, string message, bool modal)
         {
-            List<ScenePresence> presenceList = m_scene.GetScenePresences();
+            ScenePresence[] presenceList = m_scene.GetScenePresences();
 
-            foreach (ScenePresence presence in presenceList)
+            for (int i = 0; i < presenceList.Length; i++)
             {
+                ScenePresence presence = presenceList[i];
+
                 if (presence.Firstname == firstName && presence.Lastname == lastName)
                 {
                     presence.ControllingClient.SendAgentAlertMessage(message, modal);
@@ -99,10 +101,12 @@ namespace OpenSim.Region.CoreModules.Avatar.Dialog
         
         public void SendGeneralAlert(string message)
         {
-            List<ScenePresence> presenceList = m_scene.GetScenePresences();
+            ScenePresence[] presenceList = m_scene.GetScenePresences();
 
-            foreach (ScenePresence presence in presenceList)
+            for (int i = 0; i < presenceList.Length; i++)
             {
+                ScenePresence presence = presenceList[i];
+
                 if (!presence.IsChildAgent)
                     presence.ControllingClient.SendAlertMessage(message);
             }
@@ -150,10 +154,11 @@ namespace OpenSim.Region.CoreModules.Avatar.Dialog
         public void SendNotificationToUsersInRegion(
             UUID fromAvatarID, string fromAvatarName, string message)
         {
-            List<ScenePresence> presenceList = m_scene.GetScenePresences();
+            ScenePresence[] presences = m_scene.GetScenePresences();
 
-            foreach (ScenePresence presence in presenceList)
+            for (int i = 0; i < presences.Length; i++)
             {
+                ScenePresence presence = presences[i];
                 if (!presence.IsChildAgent)
                     presence.ControllingClient.SendBlueBoxMessage(fromAvatarID, fromAvatarName, message);
             }
diff --git a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
index 3bb162e..e3a395e 100644
--- a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
+++ b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
@@ -414,9 +414,12 @@ namespace OpenSim.Region.CoreModules.World.Estate
         private void handleEstateTeleportAllUsersHomeRequest(IClientAPI remover_client, UUID invoice, UUID senderID)
         {
             // Get a fresh list that will not change as people get teleported away
-            List<ScenePresence> prescences = m_scene.GetScenePresences(); 
-            foreach (ScenePresence p in prescences)
+            ScenePresence[] presences = m_scene.GetScenePresences();
+
+            for (int i = 0; i < presences.Length; i++)
             {
+                ScenePresence p = presences[i];
+
                 if (p.UUID != senderID)
                 {
                     // make sure they are still there, we could be working down a long list
-- 
cgit v1.1