From a108fcac957dd2283fb8904207addda6dc7582f0 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Fri, 25 Apr 2014 21:34:29 +0100
Subject: Restore overload mode accidentally disabled in a prior commit. Add a
 new config option, LogOverloads, to log when a thread pool overload occurs.
 This option defaults to "True" because the logging data is useful for
 diagnosing threading issues.

---
 OpenSim/Framework/Util.cs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Framework')

diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs
index c8a0c68..740e55a 100644
--- a/OpenSim/Framework/Util.cs
+++ b/OpenSim/Framework/Util.cs
@@ -127,12 +127,14 @@ namespace OpenSim.Framework
         /// 3 = full stack trace, including common threads
         /// </summary>
         public static int LogThreadPool { get; set; }
+        public static bool LogOverloads { get; set; }
 
         public static readonly int MAX_THREADPOOL_LEVEL = 3;
 
         static Util()
         {
             LogThreadPool = 0;
+            LogOverloads = true;
         }
 
         private static uint nextXferID = 5000;
@@ -2172,7 +2174,7 @@ namespace OpenSim.Framework
             {
                 long numRunning = numRunningThreadFuncs;
 
-                if (m_ThreadPool != null)
+                if (m_ThreadPool != null && LogOverloads)
                 {
                     if ((threadFuncOverloadMode == 0) && (numRunning >= m_ThreadPool.MaxThreads))
                     {
@@ -2193,7 +2195,7 @@ namespace OpenSim.Framework
                     threadInfo.StackTrace = full;
                     threadInfo.LogThread = ShouldLogThread(partial);
 
-                    if (loggingEnabled && threadInfo.LogThread)
+                    if (threadInfo.LogThread)
                     {
                         m_log.DebugFormat("Queue threadfunc {0} (Queued {1}, Running {2}) {3}{4}",
                             threadFuncNum, numQueued, numRunningThreadFuncs,
-- 
cgit v1.1