aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie2009-10-22 04:02:26 +0100
committerMelanie2009-10-22 04:02:26 +0100
commit8ce4fd7234bd460652f6159a3b7a21d2bebee05d (patch)
tree790e26802bcf41a286a98b734b57ae7b5dc9ed8f
parentAdd MaxPoolThreads in startup to limit the size of the thread pool used (diff)
downloadopensim-SC-8ce4fd7234bd460652f6159a3b7a21d2bebee05d.zip
opensim-SC-8ce4fd7234bd460652f6159a3b7a21d2bebee05d.tar.gz
opensim-SC-8ce4fd7234bd460652f6159a3b7a21d2bebee05d.tar.bz2
opensim-SC-8ce4fd7234bd460652f6159a3b7a21d2bebee05d.tar.xz
Reduce the default pool threads to 15 (from 30) and the minimum from 5 to 2
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/Util.cs2
-rw-r--r--OpenSim/Region/Application/OpenSim.cs2
-rw-r--r--bin/OpenSim.ini.example2
3 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs
index 9dfb75e..7dde6dd 100644
--- a/OpenSim/Framework/Util.cs
+++ b/OpenSim/Framework/Util.cs
@@ -1302,7 +1302,7 @@ namespace OpenSim.Framework
1302 STPStartInfo startInfo = new STPStartInfo(); 1302 STPStartInfo startInfo = new STPStartInfo();
1303 startInfo.IdleTimeout = 2000; // 2 seconds 1303 startInfo.IdleTimeout = 2000; // 2 seconds
1304 startInfo.MaxWorkerThreads = maxThreads; 1304 startInfo.MaxWorkerThreads = maxThreads;
1305 startInfo.MinWorkerThreads = 5; 1305 startInfo.MinWorkerThreads = 2;
1306 startInfo.StackSize = 524288; 1306 startInfo.StackSize = 524288;
1307 startInfo.ThreadPriority = ThreadPriority.Normal; 1307 startInfo.ThreadPriority = ThreadPriority.Normal;
1308 1308
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs
index 42e2a1e..c9cec75 100644
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -67,7 +67,7 @@ namespace OpenSim
67 67
68 IConfig startupConfig = m_config.Source.Configs["Startup"]; 68 IConfig startupConfig = m_config.Source.Configs["Startup"];
69 69
70 Util.SetMaxThreads(startupConfig.GetInt("MaxPoolThreads", 30)); 70 Util.SetMaxThreads(startupConfig.GetInt("MaxPoolThreads", 15));
71 71
72 if (startupConfig != null) 72 if (startupConfig != null)
73 { 73 {
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 92e6d91..25d3f39 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -43,7 +43,7 @@
43 clientstack_plugin="OpenSim.Region.ClientStack.LindenUDP.dll" 43 clientstack_plugin="OpenSim.Region.ClientStack.LindenUDP.dll"
44 44
45 ; Max threads to allocate on the FireAndForget pool 45 ; Max threads to allocate on the FireAndForget pool
46 MaxPoolThreads = 30 46 MaxPoolThreads = 15
47 47
48 ; ## 48 ; ##
49 ; ## REGIONS 49 ; ## REGIONS