diff options
author | Justin Clark-Casey (justincc) | 2012-11-23 04:40:49 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2012-11-23 04:40:49 +0000 |
commit | 999cb4b20cc20a24c7b9fbce4c31b13f8bf36cb5 (patch) | |
tree | a73ecf998adad5920e94c570743e6897ae1a87f4 /OpenSim/Framework/Util.cs | |
parent | Make "force gc" console command available across all servers (diff) | |
download | opensim-SC_OLD-999cb4b20cc20a24c7b9fbce4c31b13f8bf36cb5.zip opensim-SC_OLD-999cb4b20cc20a24c7b9fbce4c31b13f8bf36cb5.tar.gz opensim-SC_OLD-999cb4b20cc20a24c7b9fbce4c31b13f8bf36cb5.tar.bz2 opensim-SC_OLD-999cb4b20cc20a24c7b9fbce4c31b13f8bf36cb5.tar.xz |
Make "show threads" and "thread abort" console commands available on all servers
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/Util.cs | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs index c369dbc..a0c54a0 100644 --- a/OpenSim/Framework/Util.cs +++ b/OpenSim/Framework/Util.cs | |||
@@ -1741,12 +1741,16 @@ namespace OpenSim.Framework | |||
1741 | StringBuilder sb = new StringBuilder(); | 1741 | StringBuilder sb = new StringBuilder(); |
1742 | if (FireAndForgetMethod == FireAndForgetMethod.SmartThreadPool) | 1742 | if (FireAndForgetMethod == FireAndForgetMethod.SmartThreadPool) |
1743 | { | 1743 | { |
1744 | threadPoolUsed = "SmartThreadPool"; | 1744 | // ROBUST currently leaves this the FireAndForgetMethod but never actually initializes the threadpool. |
1745 | maxThreads = m_ThreadPool.MaxThreads; | 1745 | if (m_ThreadPool != null) |
1746 | minThreads = m_ThreadPool.MinThreads; | 1746 | { |
1747 | inUseThreads = m_ThreadPool.InUseThreads; | 1747 | threadPoolUsed = "SmartThreadPool"; |
1748 | allocatedThreads = m_ThreadPool.ActiveThreads; | 1748 | maxThreads = m_ThreadPool.MaxThreads; |
1749 | waitingCallbacks = m_ThreadPool.WaitingCallbacks; | 1749 | minThreads = m_ThreadPool.MinThreads; |
1750 | inUseThreads = m_ThreadPool.InUseThreads; | ||
1751 | allocatedThreads = m_ThreadPool.ActiveThreads; | ||
1752 | waitingCallbacks = m_ThreadPool.WaitingCallbacks; | ||
1753 | } | ||
1750 | } | 1754 | } |
1751 | else if ( | 1755 | else if ( |
1752 | FireAndForgetMethod == FireAndForgetMethod.UnsafeQueueUserWorkItem | 1756 | FireAndForgetMethod == FireAndForgetMethod.UnsafeQueueUserWorkItem |