aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Util.cs
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/Util.cs16
1 files changed, 10 insertions, 6 deletions
diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs
index e76a37b..7d88604 100644
--- a/OpenSim/Framework/Util.cs
+++ b/OpenSim/Framework/Util.cs
@@ -1753,12 +1753,16 @@ namespace OpenSim.Framework
1753 StringBuilder sb = new StringBuilder(); 1753 StringBuilder sb = new StringBuilder();
1754 if (FireAndForgetMethod == FireAndForgetMethod.SmartThreadPool) 1754 if (FireAndForgetMethod == FireAndForgetMethod.SmartThreadPool)
1755 { 1755 {
1756 threadPoolUsed = "SmartThreadPool"; 1756 // ROBUST currently leaves this the FireAndForgetMethod but never actually initializes the threadpool.
1757 maxThreads = m_ThreadPool.MaxThreads; 1757 if (m_ThreadPool != null)
1758 minThreads = m_ThreadPool.MinThreads; 1758 {
1759 inUseThreads = m_ThreadPool.InUseThreads; 1759 threadPoolUsed = "SmartThreadPool";
1760 allocatedThreads = m_ThreadPool.ActiveThreads; 1760 maxThreads = m_ThreadPool.MaxThreads;
1761 waitingCallbacks = m_ThreadPool.WaitingCallbacks; 1761 minThreads = m_ThreadPool.MinThreads;
1762 inUseThreads = m_ThreadPool.InUseThreads;
1763 allocatedThreads = m_ThreadPool.ActiveThreads;
1764 waitingCallbacks = m_ThreadPool.WaitingCallbacks;
1765 }
1762 } 1766 }
1763 else if ( 1767 else if (
1764 FireAndForgetMethod == FireAndForgetMethod.UnsafeQueueUserWorkItem 1768 FireAndForgetMethod == FireAndForgetMethod.UnsafeQueueUserWorkItem