aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2013-08-09 18:27:26 +0100
committerJustin Clark-Casey (justincc)2013-08-09 18:27:26 +0100
commit23ca1f859e20e537572cb774943784d50d3cacb8 (patch)
tree22318dbee4bcda6fd237c6e2003d6b43d175d10b
parentIncrease wait for source region to sent UpdateAgent to 10 seconds instead of 4. (diff)
downloadopensim-SC_OLD-23ca1f859e20e537572cb774943784d50d3cacb8.zip
opensim-SC_OLD-23ca1f859e20e537572cb774943784d50d3cacb8.tar.gz
opensim-SC_OLD-23ca1f859e20e537572cb774943784d50d3cacb8.tar.bz2
opensim-SC_OLD-23ca1f859e20e537572cb774943784d50d3cacb8.tar.xz
minor: Consistently log IOCP for IO completion thread startup log information instead of mixing this with "IO Completion Threads"
-rw-r--r--OpenSim/Region/Application/Application.cs6
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Application/Application.cs b/OpenSim/Region/Application/Application.cs
index 2e155ec..3a4e5df 100644
--- a/OpenSim/Region/Application/Application.cs
+++ b/OpenSim/Region/Application/Application.cs
@@ -142,19 +142,19 @@ namespace OpenSim
142 if (iocpThreads < iocpThreadsMin) 142 if (iocpThreads < iocpThreadsMin)
143 { 143 {
144 iocpThreads = iocpThreadsMin; 144 iocpThreads = iocpThreadsMin;
145 m_log.InfoFormat("[OPENSIM MAIN]: Bumping up max IO completion threads to {0}",iocpThreads); 145 m_log.InfoFormat("[OPENSIM MAIN]: Bumping up max IOCP threads to {0}",iocpThreads);
146 } 146 }
147 // Make sure we don't overallocate IOCP threads and thrash system resources 147 // Make sure we don't overallocate IOCP threads and thrash system resources
148 if ( iocpThreads > iocpThreadsMax ) 148 if ( iocpThreads > iocpThreadsMax )
149 { 149 {
150 iocpThreads = iocpThreadsMax; 150 iocpThreads = iocpThreadsMax;
151 m_log.InfoFormat("[OPENSIM MAIN]: Limiting max IO completion threads to {0}",iocpThreads); 151 m_log.InfoFormat("[OPENSIM MAIN]: Limiting max IOCP completion threads to {0}",iocpThreads);
152 } 152 }
153 // set the resulting worker and IO completion thread counts back to ThreadPool 153 // set the resulting worker and IO completion thread counts back to ThreadPool
154 if ( System.Threading.ThreadPool.SetMaxThreads(workerThreads, iocpThreads) ) 154 if ( System.Threading.ThreadPool.SetMaxThreads(workerThreads, iocpThreads) )
155 { 155 {
156 m_log.InfoFormat( 156 m_log.InfoFormat(
157 "[OPENSIM MAIN]: Threadpool set to {0} max worker threads and {1} max IO completion threads", 157 "[OPENSIM MAIN]: Threadpool set to {0} max worker threads and {1} max IOCP threads",
158 workerThreads, iocpThreads); 158 workerThreads, iocpThreads);
159 } 159 }
160 else 160 else