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.
remove-scene-viewer
Justin Clark-Casey (justincc) 2011-10-29 02:42:53 +01:00
parent 9fdd1753fa
commit 6d97545b6b
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; }

6
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>
@ -186,8 +184,6 @@ namespace OpenSim.Region.Framework.Scenes
/// <param name="elapsed"></param> /// <param name="elapsed"></param>
/// <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 // Here is where the Scene calls the PhysicsScene. This is a one-way
// interaction; the PhysicsScene cannot access the calling Scene directly. // interaction; the PhysicsScene cannot access the calling Scene directly.
@ -204,10 +200,8 @@ namespace OpenSim.Region.Framework.Scenes
// position). // position).
// //
// Therefore, JointMoved and JointDeactivated events will be fired as a result of the following Simulate(). // Therefore, JointMoved and JointDeactivated events will be fired as a result of the following Simulate().
return _PhyScene.Simulate((float)elapsed); return _PhyScene.Simulate((float)elapsed);
} }
}
protected internal void UpdateScenePresenceMovement() protected internal void UpdateScenePresenceMovement()
{ {

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

@ -521,7 +521,6 @@ namespace OpenSim.Region.Framework.Scenes
{ {
try try
{ {
lock (m_scene.SyncRoot)
PhysicsActor.Position = value; PhysicsActor.Position = value;
} }
catch (Exception e) catch (Exception e)
@ -572,7 +571,6 @@ namespace OpenSim.Region.Framework.Scenes
{ {
try try
{ {
lock (m_scene.SyncRoot)
PhysicsActor.Velocity = value; PhysicsActor.Velocity = value;
} }
catch (Exception e) catch (Exception e)