diff options
author | Justin Clark-Casey (justincc) | 2014-01-16 23:33:30 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2014-01-16 23:33:30 +0000 |
commit | f467121c519520befad603ba69120fd1664cdb25 (patch) | |
tree | 70da94ca852b19bdf5e2a66569db4e5ffb246e21 /OpenSim | |
parent | Merge branch 'justincc-master' (diff) | |
parent | Actually put IsChildAgent = true inside the lock, otherwise there is still a ... (diff) | |
download | opensim-SC_OLD-f467121c519520befad603ba69120fd1664cdb25.zip opensim-SC_OLD-f467121c519520befad603ba69120fd1664cdb25.tar.gz opensim-SC_OLD-f467121c519520befad603ba69120fd1664cdb25.tar.bz2 opensim-SC_OLD-f467121c519520befad603ba69120fd1664cdb25.tar.xz |
Merge branch 'justincc-master'
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 33 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAgentTests.cs | 92 |
2 files changed, 68 insertions, 57 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 5e80f5a..18d84a2 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -109,6 +109,16 @@ namespace OpenSim.Region.Framework.Scenes | |||
109 | } | 109 | } |
110 | } | 110 | } |
111 | 111 | ||
112 | /// <summary> | ||
113 | /// This exists to prevent race conditions between two CompleteMovement threads if the simulator is slow and | ||
114 | /// the viewer fires these in quick succession. | ||
115 | /// </summary> | ||
116 | /// <remarks> | ||
117 | /// TODO: The child -> agent transition should be folded into LifecycleState and the CompleteMovement | ||
118 | /// regulation done there. | ||
119 | /// </remarks> | ||
120 | private object m_completeMovementLock = new object(); | ||
121 | |||
112 | // private static readonly byte[] DEFAULT_TEXTURE = AvatarAppearance.GetDefaultTexture().GetBytes(); | 122 | // private static readonly byte[] DEFAULT_TEXTURE = AvatarAppearance.GetDefaultTexture().GetBytes(); |
113 | private static readonly Array DIR_CONTROL_FLAGS = Enum.GetValues(typeof(Dir_ControlFlags)); | 123 | private static readonly Array DIR_CONTROL_FLAGS = Enum.GetValues(typeof(Dir_ControlFlags)); |
114 | private static readonly Vector3 HEAD_ADJUSTMENT = new Vector3(0f, 0f, 0.3f); | 124 | private static readonly Vector3 HEAD_ADJUSTMENT = new Vector3(0f, 0f, 0.3f); |
@@ -982,6 +992,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
982 | /// <summary> | 992 | /// <summary> |
983 | /// Turns a child agent into a root agent. | 993 | /// Turns a child agent into a root agent. |
984 | /// </summary> | 994 | /// </summary> |
995 | /// <remarks> | ||
985 | /// Child agents are logged into neighbouring sims largely to observe changes. Root agents exist when the | 996 | /// Child agents are logged into neighbouring sims largely to observe changes. Root agents exist when the |
986 | /// avatar is actual in the sim. They can perform all actions. | 997 | /// avatar is actual in the sim. They can perform all actions. |
987 | /// This change is made whenever an avatar enters a region, whether by crossing over from a neighbouring sim, | 998 | /// This change is made whenever an avatar enters a region, whether by crossing over from a neighbouring sim, |
@@ -989,8 +1000,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
989 | /// | 1000 | /// |
990 | /// This method is on the critical path for transferring an avatar from one region to another. Delay here | 1001 | /// This method is on the critical path for transferring an avatar from one region to another. Delay here |
991 | /// delays that crossing. | 1002 | /// delays that crossing. |
992 | /// </summary> | 1003 | /// </remarks> |
993 | private void MakeRootAgent(Vector3 pos, bool isFlying) | 1004 | private bool MakeRootAgent(Vector3 pos, bool isFlying) |
994 | { | 1005 | { |
995 | // m_log.InfoFormat( | 1006 | // m_log.InfoFormat( |
996 | // "[SCENE]: Upgrading child to root agent for {0} in {1}", | 1007 | // "[SCENE]: Upgrading child to root agent for {0} in {1}", |
@@ -1030,7 +1041,13 @@ namespace OpenSim.Region.Framework.Scenes | |||
1030 | 1041 | ||
1031 | //m_log.DebugFormat("[SCENE]: known regions in {0}: {1}", Scene.RegionInfo.RegionName, KnownChildRegionHandles.Count); | 1042 | //m_log.DebugFormat("[SCENE]: known regions in {0}: {1}", Scene.RegionInfo.RegionName, KnownChildRegionHandles.Count); |
1032 | 1043 | ||
1033 | IsChildAgent = false; | 1044 | lock (m_completeMovementLock) |
1045 | { | ||
1046 | if (!IsChildAgent) | ||
1047 | return false; | ||
1048 | |||
1049 | IsChildAgent = false; | ||
1050 | } | ||
1034 | 1051 | ||
1035 | // Must reset this here so that a teleport to a region next to an existing region does not keep the flag | 1052 | // Must reset this here so that a teleport to a region next to an existing region does not keep the flag |
1036 | // set and prevent the close of the connection on a subsequent re-teleport. | 1053 | // set and prevent the close of the connection on a subsequent re-teleport. |
@@ -1213,6 +1230,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1213 | 1230 | ||
1214 | m_scene.EventManager.TriggerOnMakeRootAgent(this); | 1231 | m_scene.EventManager.TriggerOnMakeRootAgent(this); |
1215 | 1232 | ||
1233 | return true; | ||
1216 | } | 1234 | } |
1217 | 1235 | ||
1218 | public int GetStateSource() | 1236 | public int GetStateSource() |
@@ -1636,7 +1654,14 @@ namespace OpenSim.Region.Framework.Scenes | |||
1636 | } | 1654 | } |
1637 | 1655 | ||
1638 | bool flying = ((m_AgentControlFlags & AgentManager.ControlFlags.AGENT_CONTROL_FLY) != 0); | 1656 | bool flying = ((m_AgentControlFlags & AgentManager.ControlFlags.AGENT_CONTROL_FLY) != 0); |
1639 | MakeRootAgent(AbsolutePosition, flying); | 1657 | if (!MakeRootAgent(AbsolutePosition, flying)) |
1658 | { | ||
1659 | m_log.DebugFormat( | ||
1660 | "[SCENE PRESENCE]: Aborting CompleteMovement call for {0} in {1} as they are already root", | ||
1661 | Name, Scene.Name); | ||
1662 | |||
1663 | return; | ||
1664 | } | ||
1640 | 1665 | ||
1641 | // Tell the client that we're totally ready | 1666 | // Tell the client that we're totally ready |
1642 | ControllingClient.MoveAgentIntoRegion(m_scene.RegionInfo, AbsolutePosition, look); | 1667 | ControllingClient.MoveAgentIntoRegion(m_scene.RegionInfo, AbsolutePosition, look); |
diff --git a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAgentTests.cs b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAgentTests.cs index d1aeaee..1ff1329 100644 --- a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAgentTests.cs +++ b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAgentTests.cs | |||
@@ -111,6 +111,45 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
111 | Assert.That(scene.GetScenePresences().Count, Is.EqualTo(1)); | 111 | Assert.That(scene.GetScenePresences().Count, Is.EqualTo(1)); |
112 | } | 112 | } |
113 | 113 | ||
114 | /// <summary> | ||
115 | /// Test that duplicate complete movement calls are ignored. | ||
116 | /// </summary> | ||
117 | /// <remarks> | ||
118 | /// If duplicate calls are not ignored then there is a risk of race conditions or other unexpected effects. | ||
119 | /// </remarks> | ||
120 | [Test] | ||
121 | public void TestDupeCompleteMovementCalls() | ||
122 | { | ||
123 | TestHelpers.InMethod(); | ||
124 | // TestHelpers.EnableLogging(); | ||
125 | |||
126 | UUID spUuid = TestHelpers.ParseTail(0x1); | ||
127 | |||
128 | TestScene scene = new SceneHelpers().SetupScene(); | ||
129 | |||
130 | int makeRootAgentEvents = 0; | ||
131 | scene.EventManager.OnMakeRootAgent += spi => makeRootAgentEvents++; | ||
132 | |||
133 | ScenePresence sp = SceneHelpers.AddScenePresence(scene, spUuid); | ||
134 | |||
135 | Assert.That(makeRootAgentEvents, Is.EqualTo(1)); | ||
136 | |||
137 | // Normally these would be invoked by a CompleteMovement message coming in to the UDP stack. But for | ||
138 | // convenience, here we will invoke it manually. | ||
139 | sp.CompleteMovement(sp.ControllingClient, true); | ||
140 | |||
141 | Assert.That(makeRootAgentEvents, Is.EqualTo(1)); | ||
142 | |||
143 | // Check rest of exepcted parameters. | ||
144 | Assert.That(scene.AuthenticateHandler.GetAgentCircuitData(spUuid), Is.Not.Null); | ||
145 | Assert.That(scene.AuthenticateHandler.GetAgentCircuits().Count, Is.EqualTo(1)); | ||
146 | |||
147 | Assert.That(sp.IsChildAgent, Is.False); | ||
148 | Assert.That(sp.UUID, Is.EqualTo(spUuid)); | ||
149 | |||
150 | Assert.That(scene.GetScenePresences().Count, Is.EqualTo(1)); | ||
151 | } | ||
152 | |||
114 | [Test] | 153 | [Test] |
115 | public void TestCreateDuplicateRootScenePresence() | 154 | public void TestCreateDuplicateRootScenePresence() |
116 | { | 155 | { |
@@ -249,58 +288,5 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
249 | // Assert.That(childPresence, Is.Not.Null); | 288 | // Assert.That(childPresence, Is.Not.Null); |
250 | // Assert.That(childPresence.IsChildAgent, Is.True); | 289 | // Assert.That(childPresence.IsChildAgent, Is.True); |
251 | } | 290 | } |
252 | |||
253 | // /// <summary> | ||
254 | // /// Test adding a root agent to a scene. Doesn't yet actually complete crossing the agent into the scene. | ||
255 | // /// </summary> | ||
256 | // [Test] | ||
257 | // public void T010_TestAddRootAgent() | ||
258 | // { | ||
259 | // TestHelpers.InMethod(); | ||
260 | // | ||
261 | // string firstName = "testfirstname"; | ||
262 | // | ||
263 | // AgentCircuitData agent = new AgentCircuitData(); | ||
264 | // agent.AgentID = agent1; | ||
265 | // agent.firstname = firstName; | ||
266 | // agent.lastname = "testlastname"; | ||
267 | // agent.SessionID = UUID.Random(); | ||
268 | // agent.SecureSessionID = UUID.Random(); | ||
269 | // agent.circuitcode = 123; | ||
270 | // agent.BaseFolder = UUID.Zero; | ||
271 | // agent.InventoryFolder = UUID.Zero; | ||
272 | // agent.startpos = Vector3.Zero; | ||
273 | // agent.CapsPath = GetRandomCapsObjectPath(); | ||
274 | // agent.ChildrenCapSeeds = new Dictionary<ulong, string>(); | ||
275 | // agent.child = true; | ||
276 | // | ||
277 | // scene.PresenceService.LoginAgent(agent.AgentID.ToString(), agent.SessionID, agent.SecureSessionID); | ||
278 | // | ||
279 | // string reason; | ||
280 | // scene.NewUserConnection(agent, (uint)TeleportFlags.ViaLogin, out reason); | ||
281 | // testclient = new TestClient(agent, scene); | ||
282 | // scene.AddNewAgent(testclient); | ||
283 | // | ||
284 | // ScenePresence presence = scene.GetScenePresence(agent1); | ||
285 | // | ||
286 | // Assert.That(presence, Is.Not.Null, "presence is null"); | ||
287 | // Assert.That(presence.Firstname, Is.EqualTo(firstName), "First name not same"); | ||
288 | // acd1 = agent; | ||
289 | // } | ||
290 | // | ||
291 | // /// <summary> | ||
292 | // /// Test removing an uncrossed root agent from a scene. | ||
293 | // /// </summary> | ||
294 | // [Test] | ||
295 | // public void T011_TestRemoveRootAgent() | ||
296 | // { | ||
297 | // TestHelpers.InMethod(); | ||
298 | // | ||
299 | // scene.RemoveClient(agent1); | ||
300 | // | ||
301 | // ScenePresence presence = scene.GetScenePresence(agent1); | ||
302 | // | ||
303 | // Assert.That(presence, Is.Null, "presence is not null"); | ||
304 | // } | ||
305 | } | 291 | } |
306 | } \ No newline at end of file | 292 | } \ No newline at end of file |