From b18c8c8e78172abebb82491700a0b5f9f40c1d66 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 17 May 2012 23:59:43 +0100
Subject: Don't eagerly clear frame collision events when physics actors
 subscribe and unsubscribe from collisions, in order to avoid a race
 condition.

Since this is done directly from ScenePresence, it can lead to a race condition with the simulator loop.
There's no real point doing it anyway since the clear will be done very shortly afterwards by the simulate loop and either there are no events (for a new avatar) or events don't matter (for a departing avatar).
This matches existing behaviour in OdePrim
---
 OpenSim/Region/Physics/OdePlugin/ODECharacter.cs | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Region/Physics/OdePlugin/ODECharacter.cs')

diff --git a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
index 8397eb4..1b1c44a 100644
--- a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
+++ b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
@@ -1261,14 +1261,20 @@ namespace OpenSim.Region.Physics.OdePlugin
         {
             m_requestedUpdateFrequency = ms;
             m_eventsubscription = ms;
-            CollisionEventsThisFrame.Clear();
+
+            // Don't clear collision event reporting here.  This is called directly from scene code and so can lead
+            // to a race condition with the simulate loop
+
             _parent_scene.AddCollisionEventReporting(this);
         }
 
         public override void UnSubscribeEvents()
         {
             CollisionEventsThisFrame.Clear();
-            _parent_scene.RemoveCollisionEventReporting(this);
+
+            // Don't clear collision event reporting here.  This is called directly from scene code and so can lead
+            // to a race condition with the simulate loop
+            
             m_requestedUpdateFrequency = 0;
             m_eventsubscription = 0;
         }
-- 
cgit v1.1


From 6501b1b1bb297eb5ed8a44447f771c7b73b0e905 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 18 May 2012 00:38:29 +0100
Subject: refactor: move EventQueueGet path generation into common method. 
 Rename some local variables in line with code conventions.  Add commented out
 EQG log lines for future use.

---
 OpenSim/Region/Physics/OdePlugin/ODECharacter.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'OpenSim/Region/Physics/OdePlugin/ODECharacter.cs')

diff --git a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
index 1b1c44a..54b69a2 100644
--- a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
+++ b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
@@ -1274,7 +1274,7 @@ namespace OpenSim.Region.Physics.OdePlugin
 
             // Don't clear collision event reporting here.  This is called directly from scene code and so can lead
             // to a race condition with the simulate loop
-            
+
             m_requestedUpdateFrequency = 0;
             m_eventsubscription = 0;
         }
-- 
cgit v1.1


From 1a7be7b00eaef0140f2dc13f3e14d8150c393b08 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 29 Jun 2012 00:36:50 +0100
Subject: Fix a regression where we stopped removing avatars from collision
 event reporting on logout, rather than stopping clearing their collision
 events.

This occurred in b18c8c8 (Thu May 17 2012).
This was a cause of very occasional race conditions and likely memory leakage as clients came and went from the region.
---
 OpenSim/Region/Physics/OdePlugin/ODECharacter.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'OpenSim/Region/Physics/OdePlugin/ODECharacter.cs')

diff --git a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
index 54b69a2..f3b0630 100644
--- a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
+++ b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
@@ -1270,7 +1270,7 @@ namespace OpenSim.Region.Physics.OdePlugin
 
         public override void UnSubscribeEvents()
         {
-            CollisionEventsThisFrame.Clear();
+            _parent_scene.RemoveCollisionEventReporting(this);
 
             // Don't clear collision event reporting here.  This is called directly from scene code and so can lead
             // to a race condition with the simulate loop
-- 
cgit v1.1