3 files changed, 22 insertions, 64 deletions

diff --git a/OpenSim/Framework/Servers/BaseOpenSimServer.cs b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
index f0f8d01..cbab2db 100644
--- a/OpenSim/Framework/Servers/BaseOpenSimServer.cs
+++ b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
@@ -37,6 +37,7 @@ using log4net;
 using log4net.Appender;
 using log4net.Core;
 using log4net.Repository;
+using OpenSim.Framework;
 using OpenSim.Framework.Console;
 using OpenSim.Framework.Servers;
 using OpenSim.Framework.Servers.HttpServer;
@@ -234,26 +235,19 @@ namespace OpenSim.Framework.Servers
         protected string GetThreadsReport()
         {
             StringBuilder sb = new StringBuilder();
+            Watchdog.ThreadWatchdogInfo[] threads = Watchdog.GetThreads();
 
-            ProcessThreadCollection threads = ThreadTracker.GetThreads();
-            if (threads == null)
+            sb.Append(threads.Length + " threads are being tracked:" + Environment.NewLine);
+            foreach (Watchdog.ThreadWatchdogInfo twi in threads)
             {
-                sb.Append("OpenSim thread tracking is only enabled in DEBUG mode.");
+                Thread t = twi.Thread;
+                
+                sb.Append(
+                    "ID: " + t.ManagedThreadId + ", Name: " + t.Name + ", TimeRunning: " 
+                    + "Pri: " + t.Priority + ", State: " + t.ThreadState);
+                sb.Append(Environment.NewLine);
             }
-            else
-            {
-                sb.Append(threads.Count + " threads are being tracked:" + Environment.NewLine);
-                foreach (ProcessThread t in threads)
-                {
-                    sb.Append("ID: " + t.Id + ", TotalProcessorTime: " + t.TotalProcessorTime + ", TimeRunning: " +
-                        (DateTime.Now - t.StartTime) + ", Pri: " + t.CurrentPriority + ", State: " + t.ThreadState);
-                    if (t.ThreadState == System.Diagnostics.ThreadState.Wait)
-                        sb.Append(", Reason: " + t.WaitReason + Environment.NewLine);
-                    else
-                        sb.Append(Environment.NewLine);
 
-                }
-            }
             int workers = 0, ports = 0, maxWorkers = 0, maxPorts = 0;
             ThreadPool.GetAvailableThreads(out workers, out ports);
             ThreadPool.GetMaxThreads(out maxWorkers, out maxPorts);
diff --git a/OpenSim/Framework/ThreadTracker.cs b/OpenSim/Framework/ThreadTracker.cs
deleted file mode 100644
index 069e98b..0000000
--- a/OpenSim/Framework/ThreadTracker.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSimulator Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-using System;
-using System.Collections.Generic;
-using System.Reflection;
-using System.Diagnostics;
-using log4net;
-
-namespace OpenSim.Framework
-{
-    public static class ThreadTracker
-    {
-//        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-
-        public static ProcessThreadCollection GetThreads()
-        {
-            Process thisProc = Process.GetCurrentProcess();
-            return thisProc.Threads;
-        }
-    }
-}
diff --git a/OpenSim/Framework/Watchdog.cs b/OpenSim/Framework/Watchdog.cs
index bc19dd1..9baf3a0 100644
--- a/OpenSim/Framework/Watchdog.cs
+++ b/OpenSim/Framework/Watchdog.cs
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) Contributors, http://opensimulator.org/
  * See CONTRIBUTORS.TXT for a full list of copyright holders.
  *
@@ -27,6 +27,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Threading;
 using log4net;
 
@@ -43,7 +44,7 @@ namespace OpenSim.Framework
         const int WATCHDOG_TIMEOUT_MS = 5000;
 
         [System.Diagnostics.DebuggerDisplay("{Thread.Name}")]
-        private class ThreadWatchdogInfo
+        public class ThreadWatchdogInfo
         {
             public Thread Thread;
             public int LastTick;
@@ -149,6 +150,15 @@ namespace OpenSim.Framework
             }
             catch { }
         }
+        
+        /// <summary>
+        /// Get currently watched threads for diagnostic purposes
+        /// </summary>
+        /// <returns></returns>
+        public static ThreadWatchdogInfo[] GetThreads()
+        {
+            return m_threads.Values.ToArray();
+        }
 
         private static void WatchdogTimerElapsed(object sender, System.Timers.ElapsedEventArgs e)
         {