ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-12 20:55:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Take watchdog alarm calling back outside the m_threads lock.

Browse Source 
This is how it was originally.  This stops a very long running alarm callback from causing a problem.
This commit is contained in:
Justin Clark-Casey (justincc)
2012-02-24 05:25:18 +00:00
parent 9e6ffe7798
commit bafef292f4
2 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
OpenSim/Framework/Watchdog.cs
View File

@@ -262,7 +262,7 @@ namespace OpenSim.Framework
if (callback != null)
{
ThreadWatchdogInfo timedOut = null;
List<ThreadWatchdogInfo> callbackInfos = null;
lock (m_threads)
{
@@ -273,17 +273,30 @@ namespace OpenSim.Framework
if (threadInfo.Thread.ThreadState == ThreadState.Stopped)
{
RemoveThread(threadInfo.Thread.ManagedThreadId);
callback(threadInfo.Thread, threadInfo.LastTick);
if (callbackInfos == null)
callbackInfos = new List<ThreadWatchdogInfo>();
callbackInfos.Add(threadInfo);
}
else if (!threadInfo.IsTimedOut && now - threadInfo.LastTick >= threadInfo.Timeout)
{
threadInfo.IsTimedOut = true;
if (threadInfo.AlarmIfTimeout)
callback(threadInfo.Thread, threadInfo.LastTick);
{
if (callbackInfos == null)
callbackInfos = new List<ThreadWatchdogInfo>();
callbackInfos.Add(threadInfo);
}
}
}
}
if (callbackInfos != null)
foreach (ThreadWatchdogInfo callbackInfo in callbackInfos)
callback(callbackInfo.Thread, callbackInfo.LastTick);
}
m_watchdogTimer.Start();