diff options
| author | Melanie | 2009-10-08 08:07:38 +0100 |
|---|---|---|
| committer | Melanie | 2009-10-08 08:07:38 +0100 |
| commit | fe679be9e76190ac0dc8892469787e63a7a48b5c (patch) | |
| tree | 220ef33da75f09b3e7ef3684c5ed7367e175691e /OpenSim/Region/Application/Application.cs | |
| parent | store owner_uuid in the region table (diff) | |
| parent | One last attempt at tunning the locking/no locking behaviour. The previous on... (diff) | |
| download | opensim-SC-fe679be9e76190ac0dc8892469787e63a7a48b5c.zip opensim-SC-fe679be9e76190ac0dc8892469787e63a7a48b5c.tar.gz opensim-SC-fe679be9e76190ac0dc8892469787e63a7a48b5c.tar.bz2 opensim-SC-fe679be9e76190ac0dc8892469787e63a7a48b5c.tar.xz | |
Merge branch 'htb-throttle'
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/Application/Application.cs | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/OpenSim/Region/Application/Application.cs b/OpenSim/Region/Application/Application.cs index 33b01e5..555baa4 100644 --- a/OpenSim/Region/Application/Application.cs +++ b/OpenSim/Region/Application/Application.cs | |||
| @@ -91,6 +91,18 @@ namespace OpenSim | |||
| 91 | m_log.Info("[OPENSIM MAIN]: configured log4net using default OpenSim.exe.config"); | 91 | m_log.Info("[OPENSIM MAIN]: configured log4net using default OpenSim.exe.config"); |
| 92 | } | 92 | } |
| 93 | 93 | ||
| 94 | // Increase the number of IOCP threads available. Mono defaults to a tragically low number | ||
| 95 | int workerThreads, iocpThreads; | ||
| 96 | System.Threading.ThreadPool.GetMaxThreads(out workerThreads, out iocpThreads); | ||
| 97 | m_log.InfoFormat("[OPENSIM MAIN]: Runtime gave us {0} worker threads and {1} IOCP threads", workerThreads, iocpThreads); | ||
| 98 | if (workerThreads < 500 || iocpThreads < 1000) | ||
| 99 | { | ||
| 100 | workerThreads = 500; | ||
| 101 | iocpThreads = 1000; | ||
| 102 | m_log.Info("[OPENSIM MAIN]: Bumping up to 500 worker threads and 1000 IOCP threads"); | ||
| 103 | System.Threading.ThreadPool.SetMaxThreads(workerThreads, iocpThreads); | ||
| 104 | } | ||
| 105 | |||
| 94 | // Check if the system is compatible with OpenSimulator. | 106 | // Check if the system is compatible with OpenSimulator. |
| 95 | // Ensures that the minimum system requirements are met | 107 | // Ensures that the minimum system requirements are met |
| 96 | m_log.Info("Performing compatibility checks... "); | 108 | m_log.Info("Performing compatibility checks... "); |