aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorUbitUmarov2014-10-13 12:00:31 +0100
committerUbitUmarov2014-10-13 12:00:31 +0100
commitcd87c4bec5490311d47e401acab3915f394f1a22 (patch)
tree900cf5c5cd6ce57f2bf9a3245881e3810d18607b
parentreduce minimum number of smartpool threads and name it (diff)
downloadopensim-SC-cd87c4bec5490311d47e401acab3915f394f1a22.zip
opensim-SC-cd87c4bec5490311d47e401acab3915f394f1a22.tar.gz
opensim-SC-cd87c4bec5490311d47e401acab3915f394f1a22.tar.bz2
opensim-SC-cd87c4bec5490311d47e401acab3915f394f1a22.tar.xz
change/fix previus commits
-rw-r--r--OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs12
-rw-r--r--OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs2
2 files changed, 11 insertions, 3 deletions
diff --git a/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs b/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
index 51a1136..e75b705 100644
--- a/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
+++ b/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
@@ -64,8 +64,16 @@ namespace OpenSim.Framework.Servers.HttpServer
64 m_server = pSrv; 64 m_server = pSrv;
65 m_WorkerThreadCount = pWorkerThreadCount; 65 m_WorkerThreadCount = pWorkerThreadCount;
66 m_workerThreads = new Thread[m_WorkerThreadCount]; 66 m_workerThreads = new Thread[m_WorkerThreadCount];
67 m_threadPool = new SmartThreadPool(30000, 15, 1); 67
68 m_threadPool.Name = "PoolService"; 68 STPStartInfo startInfo = new STPStartInfo();
69 startInfo.IdleTimeout = 30000;
70 startInfo.MaxWorkerThreads = 15;
71 startInfo.MinWorkerThreads = 1;
72 startInfo.ThreadPriority = ThreadPriority.Normal;
73 startInfo.StartSuspended = true;
74 startInfo.ThreadPoolName = "PoolService";
75
76 m_threadPool = new SmartThreadPool(startInfo);
69 } 77 }
70 78
71 public void Start() 79 public void Start()
diff --git a/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs b/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
index c73d81b..6880f56 100644
--- a/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
+++ b/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
@@ -339,9 +339,9 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
339 startInfo.MinWorkerThreads = 1; 339 startInfo.MinWorkerThreads = 1;
340 startInfo.ThreadPriority = ThreadPriority.BelowNormal; 340 startInfo.ThreadPriority = ThreadPriority.BelowNormal;
341 startInfo.StartSuspended = true; 341 startInfo.StartSuspended = true;
342 startInfo.ThreadPoolName = "ScriptsHttpReq";
342 343
343 ThreadPool = new SmartThreadPool(startInfo); 344 ThreadPool = new SmartThreadPool(startInfo);
344 ThreadPool.Name = "ScriptsHttpReq";
345 ThreadPool.Start(); 345 ThreadPool.Start();
346 } 346 }
347 } 347 }