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

add a nasty global lock, ode.dll requires on multi regions per instance ( also make sure ninjaJoints are disabled

LSLKeyTest
UbitUmarov 2015-11-27 22:50:28 +00:00
parent 37d7576d67
commit f59350a1ee
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
OpenSim/Region/PhysicsModules/Ode/OdeScene.cs
View File

@ -125,7 +125,8 @@ namespace OpenSim.Region.PhysicsModule.ODE
/// .../opensim/bin/libode-x86_64.so(_Z12dCollideCCTLP6dxGeomS0_iP12dContactGeomi+0x92) [0x7f03b44bcf82] /// .../opensim/bin/libode-x86_64.so(_Z12dCollideCCTLP6dxGeomS0_iP12dContactGeomi+0x92) [0x7f03b44bcf82]
/// </remarks> /// </remarks>
internal static Object UniversalColliderSyncObject = new Object(); internal static Object UniversalColliderSyncObject = new Object();
internal static Object SimulationLock = new Object();
/// <summary> /// <summary>
/// Is stats collecting enabled for this ODE scene? /// Is stats collecting enabled for this ODE scene?
/// </summary> /// </summary>
@ -647,7 +648,7 @@ namespace OpenSim.Region.PhysicsModule.ODE
physics_logging_interval = physicsconfig.GetInt("physics_logging_interval", 0); physics_logging_interval = physicsconfig.GetInt("physics_logging_interval", 0);
physics_logging_append_existing_logfile = physicsconfig.GetBoolean("physics_logging_append_existing_logfile", false); physics_logging_append_existing_logfile = physicsconfig.GetBoolean("physics_logging_append_existing_logfile", false);
m_NINJA_physics_joints_enabled = physicsconfig.GetBoolean("use_NINJA_physics_joints", false); // m_NINJA_physics_joints_enabled = physicsconfig.GetBoolean("use_NINJA_physics_joints", false);
minimumGroundFlightOffset = physicsconfig.GetFloat("minimum_ground_flight_offset", 3f); minimumGroundFlightOffset = physicsconfig.GetFloat("minimum_ground_flight_offset", 3f);
maximumMassObject = physicsconfig.GetFloat("maximum_mass_object", 10000.01f); maximumMassObject = physicsconfig.GetFloat("maximum_mass_object", 10000.01f);
} }
@ -2714,6 +2715,7 @@ namespace OpenSim.Region.PhysicsModule.ODE
CreateRequestedJoints(); // this must be outside of the lock (OdeLock) to avoid deadlocks CreateRequestedJoints(); // this must be outside of the lock (OdeLock) to avoid deadlocks
} }
lock (OdeLock) lock (OdeLock)
{ {
d.AllocateODEDataForThread(~0U); d.AllocateODEDataForThread(~0U);
@ -2867,7 +2869,8 @@ namespace OpenSim.Region.PhysicsModule.ODE
tempTick = tempTick2; tempTick = tempTick2;
} }
d.WorldQuickStep(world, ODE_STEPSIZE); lock(SimulationLock)
d.WorldQuickStep(world, ODE_STEPSIZE);
if (CollectStats) if (CollectStats)
m_stats[ODENativeStepFrameMsStatName] += Util.EnvironmentTickCountSubtract(tempTick); m_stats[ODENativeStepFrameMsStatName] += Util.EnvironmentTickCountSubtract(tempTick);
@ -3377,7 +3380,8 @@ namespace OpenSim.Region.PhysicsModule.ODE
[HandleProcessCorruptedStateExceptions] [HandleProcessCorruptedStateExceptions]
public override void Dispose() public override void Dispose()
{ {
lock (OdeLock) lock(SimulationLock)
lock(OdeLock)
{ {
if(world == IntPtr.Zero) if(world == IntPtr.Zero)
return; return;
@ -3425,7 +3429,6 @@ namespace OpenSim.Region.PhysicsModule.ODE
{ {
m_log.ErrorFormat("[ODE SCENE]: exception {0}", e.Message); m_log.ErrorFormat("[ODE SCENE]: exception {0}", e.Message);
} }
//d.CloseODE();
} }
} }