1 files changed, 49 insertions, 12 deletions

diff --git a/OpenSim/Framework/Monitoring/Watchdog.cs b/OpenSim/Framework/Monitoring/Watchdog.cs
index a644fa5..9cac451 100644
--- a/OpenSim/Framework/Monitoring/Watchdog.cs
+++ b/OpenSim/Framework/Monitoring/Watchdog.cs
@@ -96,7 +96,7 @@ namespace OpenSim.Framework.Monitoring
                 FirstTick = Environment.TickCount & Int32.MaxValue;
                 LastTick = FirstTick;
 
-                Stat 
+                Stat
                     = new Stat(
                         name,
                         string.Format("Last update of thread {0}", name),
@@ -180,6 +180,30 @@ namespace OpenSim.Framework.Monitoring
             m_watchdogTimer.Elapsed += WatchdogTimerElapsed;
         }
 
+        public static void Stop()
+        {
+            if(m_threads == null)
+                return;
+
+            lock(m_threads)
+            {
+                m_enabled = false;            
+                if(m_watchdogTimer != null)
+                {
+                    m_watchdogTimer.Dispose();
+                    m_watchdogTimer = null;
+                }
+                
+                foreach(ThreadWatchdogInfo twi in m_threads.Values)
+                {
+                    Thread t = twi.Thread;
+                    if(t.IsAlive)
+                        t.Abort();
+                }
+                m_threads.Clear();
+            }
+        }
+
         /// <summary>
         /// Add a thread to the watchdog tracker.
         /// </summary>
@@ -230,14 +254,12 @@ namespace OpenSim.Framework.Monitoring
 
                     twi.Cleanup();
                     m_threads.Remove(threadID);
-
                     return true;
                 }
                 else
                 {
                     m_log.WarnFormat(
                         "[WATCHDOG]: Requested to remove thread with ID {0} but this is not being monitored", threadID);
-
                     return false;
                 }
             }
@@ -317,6 +339,8 @@ namespace OpenSim.Framework.Monitoring
         /// <param name="e"></param>
         private static void WatchdogTimerElapsed(object sender, System.Timers.ElapsedEventArgs e)
         {
+            if(!m_enabled)
+                return;
             int now = Environment.TickCount & Int32.MaxValue;
             int msElapsed = now - LastWatchdogThreadTick;
 
@@ -332,27 +356,36 @@ namespace OpenSim.Framework.Monitoring
             if (callback != null)
             {
                 List<ThreadWatchdogInfo> callbackInfos = null;
+                List<ThreadWatchdogInfo> threadsToRemove = null;
+
+                const ThreadState thgone = ThreadState.Stopped;
 
                 lock (m_threads)
                 {
-                    foreach (ThreadWatchdogInfo threadInfo in m_threads.Values)
+                    foreach(ThreadWatchdogInfo threadInfo in m_threads.Values)
                     {
-                        if (threadInfo.Thread.ThreadState == ThreadState.Stopped)
+                        if(!m_enabled)
+                            return;
+                        if((threadInfo.Thread.ThreadState & thgone) != 0)
                         {
-                            RemoveThread(threadInfo.Thread.ManagedThreadId);
+                            if(threadsToRemove == null)
+                                threadsToRemove = new List<ThreadWatchdogInfo>();
 
-                            if (callbackInfos == null)
+                            threadsToRemove.Add(threadInfo);
+/*
+                            if(callbackInfos == null)
                                 callbackInfos = new List<ThreadWatchdogInfo>();
 
                             callbackInfos.Add(threadInfo);
+*/
                         }
-                        else if (!threadInfo.IsTimedOut && now - threadInfo.LastTick >= threadInfo.Timeout)
+                        else if(!threadInfo.IsTimedOut && now - threadInfo.LastTick >= threadInfo.Timeout)
                         {
                             threadInfo.IsTimedOut = true;
 
-                            if (threadInfo.AlarmIfTimeout)
+                            if(threadInfo.AlarmIfTimeout)
                             {
-                                if (callbackInfos == null)
+                                if(callbackInfos == null)
                                     callbackInfos = new List<ThreadWatchdogInfo>();
 
                                 // Send a copy of the watchdog info to prevent race conditions where the watchdog
@@ -361,9 +394,13 @@ namespace OpenSim.Framework.Monitoring
                             }
                         }
                     }
+
+                    if(threadsToRemove != null)
+                        foreach(ThreadWatchdogInfo twi in threadsToRemove)
+                            RemoveThread(twi.Thread.ManagedThreadId);
                 }
 
-                if (callbackInfos != null)
+                if(callbackInfos != null)
                     foreach (ThreadWatchdogInfo callbackInfo in callbackInfos)
                         callback(callbackInfo);
             }
@@ -377,4 +414,4 @@ namespace OpenSim.Framework.Monitoring
             m_watchdogTimer.Start();
         }
     }
-}
\ No newline at end of file
+}