From 20c65ac438ee67ecd3f837d268e44992f13a8af6 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sun, 19 Feb 2012 12:28:07 -0800
Subject: A few more tweaks on position updates and create child agents. Mono
 hates concurrent uses of the same TCP connection, and even of the connections
 to the same server. So let's stop doing it. This patch makes movement much
 smoother when there are lots of neighbours.

---
 .../Framework/Scenes/SceneCommunicationService.cs     | 19 +++++++++++++------
 OpenSim/Region/Framework/Scenes/ScenePresence.cs      |  3 ++-
 2 files changed, 15 insertions(+), 7 deletions(-)

(limited to 'OpenSim/Region/Framework/Scenes')

diff --git a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
index 58a7b20..c04171b 100644
--- a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
@@ -140,6 +140,7 @@ namespace OpenSim.Region.Framework.Scenes
             icon.EndInvoke(iar);
         }
 
+        ExpiringCache<string, bool> _failedSims = new ExpiringCache<string, bool>();
         public void SendChildAgentDataUpdate(AgentPosition cAgentData, ScenePresence presence)
         {
             // This assumes that we know what our neighbors are.
@@ -156,16 +157,22 @@ namespace OpenSim.Region.Framework.Scenes
                         // that the region position is cached or performance will degrade
                         Utils.LongToUInts(regionHandle, out x, out y);
                         GridRegion dest = m_scene.GridService.GetRegionByPosition(UUID.Zero, (int)x, (int)y);
-                        if (! simulatorList.Contains(dest.ServerURI))
+                        bool v = true;
+                        if (! simulatorList.Contains(dest.ServerURI) && !_failedSims.TryGetValue(dest.ServerURI, out v))
                         {
                             // we havent seen this simulator before, add it to the list
                             // and send it an update
                             simulatorList.Add(dest.ServerURI);
-
-                            SendChildAgentDataUpdateDelegate d = SendChildAgentDataUpdateAsync;
-                            d.BeginInvoke(cAgentData, m_regionInfo.ScopeID, dest,
-                                          SendChildAgentDataUpdateCompleted,
-                                          d);
+                            // Let move this to sync. Mono definitely does not like async networking.
+                            if (!m_scene.SimulationService.UpdateAgent(dest, cAgentData))
+                                // Also if it fails, get it out of the loop for a bit
+                                _failedSims.Add(dest.ServerURI, true, 120);
+
+                            // Leaving this here as a reminder that we tried, and it sucks.
+                            //SendChildAgentDataUpdateDelegate d = SendChildAgentDataUpdateAsync;
+                            //d.BeginInvoke(cAgentData, m_regionInfo.ScopeID, dest,
+                            //              SendChildAgentDataUpdateCompleted,
+                            //              d);
                         }
                     }
                 }
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 77f7b32..8639697 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -2738,7 +2738,8 @@ namespace OpenSim.Region.Framework.Scenes
                 AgentPosition agentpos = new AgentPosition();
                 agentpos.CopyFrom(cadu);
 
-                m_scene.SendOutChildAgentUpdates(agentpos, this);
+                // Let's get this out of the update loop
+                Util.FireAndForget(delegate { m_scene.SendOutChildAgentUpdates(agentpos, this); });
             }
         }
 
-- 
cgit v1.1