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

Lock the heartbeat against multiple invocations. May prevent deadlocks and/or 

runaway thread use
prioritization
Melanie 2009-10-06 15:28:38 +01:00
parent 8a7a947faa
commit 2a060136bd
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -137,6 +137,8 @@ namespace OpenSim.Region.Framework.Scenes
protected IAssetService m_AssetService = null; protected IAssetService m_AssetService = null;
protected IAuthorizationService m_AuthorizationService = null; protected IAuthorizationService m_AuthorizationService = null;
private Object m_heartbeatLock = new Object();
public IAssetService AssetService public IAssetService AssetService
{ {
get get
@ -942,6 +944,9 @@ namespace OpenSim.Region.Framework.Scenes
/// <param name="e"></param> /// <param name="e"></param>
private void Heartbeat(object sender) private void Heartbeat(object sender)
{ {
if (!Monitor.TryEnter(m_heartbeatLock))
return;
try try
{ {
Update(); Update();
@ -952,6 +957,11 @@ namespace OpenSim.Region.Framework.Scenes
catch (ThreadAbortException) catch (ThreadAbortException)
{ {
} }
finally
{
Monitor.Pulse(m_heartbeatLock);
Monitor.Exit(m_heartbeatLock);
}
} }
/// <summary> /// <summary>