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

forgotten locks on ubode

0.9.1.0-post-fixes
UbitUmarov 2019-01-28 03:37:54 +00:00
parent cc204a279e
commit 4c79a85621
1 changed files with 39 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
OpenSim/Region/PhysicsModules/ubOde/ODEScene.cs
View File

@ -1180,7 +1180,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
//m_log.Debug("[PHYSICS]:ODELOCK"); //m_log.Debug("[PHYSICS]:ODELOCK");
if (world == IntPtr.Zero) if (world == IntPtr.Zero)
return; return;
lock (SimulationLock)
lock (OdeLock) lock (OdeLock)
{ {
SafeNativeMethods.AllocateODEDataForThread(0); SafeNativeMethods.AllocateODEDataForThread(0);
@ -1188,7 +1188,6 @@ namespace OpenSim.Region.PhysicsModule.ubOde
} }
} }
public void addActivePrim(OdePrim activatePrim) public void addActivePrim(OdePrim activatePrim)
{ {
// adds active prim.. // adds active prim..
@ -1599,6 +1598,8 @@ namespace OpenSim.Region.PhysicsModule.ubOde
} }
// Move other active objects // Move other active objects
lock (SimulationLock)
{
lock (_activegroups) lock (_activegroups)
{ {
foreach (OdePrim aprim in _activegroups) foreach (OdePrim aprim in _activegroups)
@ -1608,8 +1609,6 @@ namespace OpenSim.Region.PhysicsModule.ubOde
} }
// moveTime += Util.GetTimeStampMS() - tmpTime; // moveTime += Util.GetTimeStampMS() - tmpTime;
// tmpTime = Util.GetTimeStampMS(); // tmpTime = Util.GetTimeStampMS();
lock (SimulationLock)
{
m_rayCastManager.ProcessQueuedRequests(); m_rayCastManager.ProcessQueuedRequests();
// rayTime += Util.GetTimeStampMS() - tmpTime; // rayTime += Util.GetTimeStampMS() - tmpTime;
@ -1686,6 +1685,8 @@ namespace OpenSim.Region.PhysicsModule.ubOde
} }
*/ */
// tmpTime = Util.GetTimeStampMS(); // tmpTime = Util.GetTimeStampMS();
lock (SimulationLock)
{
lock (_activegroups) lock (_activegroups)
{ {
{ {
@ -1698,6 +1699,8 @@ namespace OpenSim.Region.PhysicsModule.ubOde
} }
} }
} }
}
// updatesTime += Util.GetTimeStampMS() - tmpTime; // updatesTime += Util.GetTimeStampMS() - tmpTime;
} }
catch (Exception e) catch (Exception e)