OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

remove unnecessary OdeScene._activeprims locking. Code is single-threaded

0.7.2-post-fixes
Justin Clark-Casey (justincc) 2011-11-21 21:15:15 +00:00
parent bba4577d88
commit 1edfe05c16
1 changed files with 48 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

103
OpenSim/Region/Physics/OdePlugin/OdeScene.cs
View File

@ -193,8 +193,15 @@ namespace OpenSim.Region.Physics.OdePlugin
/// Avatars in the physics scene. /// Avatars in the physics scene.
/// </summary> /// </summary>
private readonly HashSet<OdeCharacter> _characters = new HashSet<OdeCharacter>(); private readonly HashSet<OdeCharacter> _characters = new HashSet<OdeCharacter>();
/// <summary>
/// Prims in the physics scene.
/// </summary>
private readonly HashSet<OdePrim> _prims = new HashSet<OdePrim>(); private readonly HashSet<OdePrim> _prims = new HashSet<OdePrim>();
/// <summary>
/// Prims in the physics scene that are subject to physics, not just collisions.
/// </summary>
private readonly HashSet<OdePrim> _activeprims = new HashSet<OdePrim>(); private readonly HashSet<OdePrim> _activeprims = new HashSet<OdePrim>();
/// <summary> /// <summary>
@ -1562,45 +1569,42 @@ namespace OpenSim.Region.Physics.OdePlugin
//} //}
} }
lock (_activeprims) List<OdePrim> removeprims = null;
foreach (OdePrim chr in _activeprims)
{ {
List<OdePrim> removeprims = null; if (chr.Body != IntPtr.Zero && d.BodyIsEnabled(chr.Body) && (!chr.m_disabled))
foreach (OdePrim chr in _activeprims)
{ {
if (chr.Body != IntPtr.Zero && d.BodyIsEnabled(chr.Body) && (!chr.m_disabled)) try
{ {
try lock (chr)
{ {
lock (chr) if (space != IntPtr.Zero && chr.prim_geom != IntPtr.Zero && chr.m_taintremove == false)
{ {
if (space != IntPtr.Zero && chr.prim_geom != IntPtr.Zero && chr.m_taintremove == false) d.SpaceCollide2(space, chr.prim_geom, IntPtr.Zero, nearCallback);
}
else
{
if (removeprims == null)
{ {
d.SpaceCollide2(space, chr.prim_geom, IntPtr.Zero, nearCallback); removeprims = new List<OdePrim>();
}
else
{
if (removeprims == null)
{
removeprims = new List<OdePrim>();
}
removeprims.Add(chr);
m_log.Debug("[PHYSICS]: unable to collide test active prim against space. The space was zero, the geom was zero or it was in the process of being removed. Removed it from the active prim list. This needs to be fixed!");
} }
removeprims.Add(chr);
m_log.Debug("[PHYSICS]: unable to collide test active prim against space. The space was zero, the geom was zero or it was in the process of being removed. Removed it from the active prim list. This needs to be fixed!");
} }
} }
catch (AccessViolationException) }
{ catch (AccessViolationException)
m_log.Warn("[PHYSICS]: Unable to space collide"); {
} m_log.Warn("[PHYSICS]: Unable to space collide");
} }
} }
}
if (removeprims != null) if (removeprims != null)
{
foreach (OdePrim chr in removeprims)
{ {
foreach (OdePrim chr in removeprims) _activeprims.Remove(chr);
{
_activeprims.Remove(chr);
}
} }
} }
} }
@ -1770,13 +1774,10 @@ namespace OpenSim.Region.Physics.OdePlugin
internal void ActivatePrim(OdePrim prim) internal void ActivatePrim(OdePrim prim)
{ {
// adds active prim.. (ones that should be iterated over in collisions_optimized // adds active prim.. (ones that should be iterated over in collisions_optimized
lock (_activeprims) if (!_activeprims.Contains(prim))
{ _activeprims.Add(prim);
if (!_activeprims.Contains(prim)) //else
_activeprims.Add(prim); // m_log.Warn("[PHYSICS]: Double Entry in _activeprims detected, potential crash immenent");
//else
// m_log.Warn("[PHYSICS]: Double Entry in _activeprims detected, potential crash immenent");
}
} }
public override PhysicsActor AddPrimShape(string primName, PrimitiveBaseShape pbs, Vector3 position, public override PhysicsActor AddPrimShape(string primName, PrimitiveBaseShape pbs, Vector3 position,
@ -2152,8 +2153,7 @@ namespace OpenSim.Region.Physics.OdePlugin
/// <param name="prim"></param> /// <param name="prim"></param>
internal void DeactivatePrim(OdePrim prim) internal void DeactivatePrim(OdePrim prim)
{ {
lock (_activeprims) _activeprims.Remove(prim);
_activeprims.Remove(prim);
} }
public override void RemovePrim(PhysicsActor prim) public override void RemovePrim(PhysicsActor prim)
@ -2804,13 +2804,10 @@ Console.WriteLine("AddPhysicsActorTaint to " + taintedprim.Name);
} }
// Move other active objects // Move other active objects
lock (_activeprims) foreach (OdePrim prim in _activeprims)
{ {
foreach (OdePrim prim in _activeprims) prim.m_collisionscore = 0;
{ prim.Move(timeStep);
prim.m_collisionscore = 0;
prim.Move(timeStep);
}
} }
//if ((framecount % m_randomizeWater) == 0) //if ((framecount % m_randomizeWater) == 0)
@ -2882,20 +2879,16 @@ Console.WriteLine("AddPhysicsActorTaint to " + taintedprim.Name);
defects.Clear(); defects.Clear();
} }
lock (_activeprims) //if (timeStep < 0.2f)
{
//if (timeStep < 0.2f)
{
foreach (OdePrim prim in _activeprims)
{
if (prim.IsPhysical && (d.BodyIsEnabled(prim.Body) || !prim._zeroFlag))
{
prim.UpdatePositionAndVelocity();
if (SupportsNINJAJoints) foreach (OdePrim prim in _activeprims)
SimulateActorPendingJoints(prim); {
} if (prim.IsPhysical && (d.BodyIsEnabled(prim.Body) || !prim._zeroFlag))
} {
prim.UpdatePositionAndVelocity();
if (SupportsNINJAJoints)
SimulateActorPendingJoints(prim);
} }
} }