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

Remove the SyncRoot locking from Scene which was only being done around the main physics loop and ScenePresence position and velocity setting 

This is no longer necessary with ODECharacter taints (ODEPrim was already not taking part in this).  BSCharacter was already tainting.
0.7.2-post-fixes
Justin Clark-Casey (justincc) 2011-10-29 02:42:53 +01:00
parent dd3dc5cd91
commit b720454950
3 changed files with 18 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
OpenSim/Region/Framework/Scenes/Scene.cs
View File

@ -509,12 +509,6 @@ namespace OpenSim.Region.Framework.Scenes
} }
} }
// This gets locked so things stay thread safe.
public object SyncRoot
{
get { return m_sceneGraph.m_syncRoot; }
}
public string DefaultScriptEngine public string DefaultScriptEngine
{ {
get { return m_defaultScriptEngine; } get { return m_defaultScriptEngine; }

38
OpenSim/Region/Framework/Scenes/SceneGraph.cs
View File

@ -84,8 +84,6 @@ namespace OpenSim.Region.Framework.Scenes
protected int m_activeScripts = 0; protected int m_activeScripts = 0;
protected int m_scriptLPS = 0; protected int m_scriptLPS = 0;
protected internal object m_syncRoot = new object();
protected internal PhysicsScene _PhyScene; protected internal PhysicsScene _PhyScene;
/// <summary> /// <summary>
@ -187,26 +185,22 @@ namespace OpenSim.Region.Framework.Scenes
/// <returns></returns> /// <returns></returns>
protected internal float UpdatePhysics(double elapsed) protected internal float UpdatePhysics(double elapsed)
{ {
lock (m_syncRoot) // Here is where the Scene calls the PhysicsScene. This is a one-way
{ // interaction; the PhysicsScene cannot access the calling Scene directly.
// Here is where the Scene calls the PhysicsScene. This is a one-way // But with joints, we want a PhysicsActor to be able to influence a
// interaction; the PhysicsScene cannot access the calling Scene directly. // non-physics SceneObjectPart. In particular, a PhysicsActor that is connected
// But with joints, we want a PhysicsActor to be able to influence a // with a joint should be able to move the SceneObjectPart which is the visual
// non-physics SceneObjectPart. In particular, a PhysicsActor that is connected // representation of that joint (for editing and serialization purposes).
// with a joint should be able to move the SceneObjectPart which is the visual // However the PhysicsActor normally cannot directly influence anything outside
// representation of that joint (for editing and serialization purposes). // of the PhysicsScene, and the non-physical SceneObjectPart which represents
// However the PhysicsActor normally cannot directly influence anything outside // the joint in the Scene does not exist in the PhysicsScene.
// of the PhysicsScene, and the non-physical SceneObjectPart which represents //
// the joint in the Scene does not exist in the PhysicsScene. // To solve this, we have an event in the PhysicsScene that is fired when a joint
// // has changed position (because one of its associated PhysicsActors has changed
// To solve this, we have an event in the PhysicsScene that is fired when a joint // position).
// has changed position (because one of its associated PhysicsActors has changed //
// position). // Therefore, JointMoved and JointDeactivated events will be fired as a result of the following Simulate().
// return _PhyScene.Simulate((float)elapsed);
// Therefore, JointMoved and JointDeactivated events will be fired as a result of the following Simulate().
return _PhyScene.Simulate((float)elapsed);
}
} }
protected internal void UpdateScenePresenceMovement() protected internal void UpdateScenePresenceMovement()

6
OpenSim/Region/Framework/Scenes/ScenePresence.cs
View File

@ -515,8 +515,7 @@ namespace OpenSim.Region.Framework.Scenes
{ {
try try
{ {
lock (m_scene.SyncRoot) m_physicsActor.Position = value;
m_physicsActor.Position = value;
} }
catch (Exception e) catch (Exception e)
{ {
@ -568,8 +567,7 @@ namespace OpenSim.Region.Framework.Scenes
{ {
try try
{ {
lock (m_scene.SyncRoot) actor.Velocity = value;
actor.Velocity = value;
} }
catch (Exception e) catch (Exception e)
{ {