aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs4
-rw-r--r--OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs12
2 files changed, 9 insertions, 7 deletions
diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
index 74954cc..d29cc61 100644
--- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
@@ -1850,8 +1850,8 @@ namespace OpenSim.Framework.Servers.HttpServer
1850 m_httpListener2.Start(64); 1850 m_httpListener2.Start(64);
1851 1851
1852 // Long Poll Service Manager with 3 worker threads a 25 second timeout for no events 1852 // Long Poll Service Manager with 3 worker threads a 25 second timeout for no events
1853// m_PollServiceManager = new PollServiceRequestManager(this, 3, 25000);
1854 m_PollServiceManager = new PollServiceRequestManager(this, 4, 25000); 1853 m_PollServiceManager = new PollServiceRequestManager(this, 4, 25000);
1854 m_PollServiceManager.Start();
1855 HTTPDRunning = true; 1855 HTTPDRunning = true;
1856 1856
1857 //HttpListenerContext context; 1857 //HttpListenerContext context;
@@ -1904,7 +1904,7 @@ namespace OpenSim.Framework.Servers.HttpServer
1904 HTTPDRunning = false; 1904 HTTPDRunning = false;
1905 try 1905 try
1906 { 1906 {
1907// m_PollServiceManager.Stop(); 1907 m_PollServiceManager.Stop();
1908 1908
1909 m_httpListener2.ExceptionThrown -= httpServerException; 1909 m_httpListener2.ExceptionThrown -= httpServerException;
1910 //m_httpListener2.DisconnectHandler = null; 1910 //m_httpListener2.DisconnectHandler = null;
diff --git a/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs b/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
index 7628e23..c2254c4 100644
--- a/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
+++ b/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
@@ -203,14 +203,17 @@ namespace OpenSim.Framework.Servers.HttpServer
203 m_server = pSrv; 203 m_server = pSrv;
204 m_WorkerThreadCount = pWorkerThreadCount; 204 m_WorkerThreadCount = pWorkerThreadCount;
205 m_workerThreads = new Thread[m_WorkerThreadCount]; 205 m_workerThreads = new Thread[m_WorkerThreadCount];
206 }
206 207
208 public void Start()
209 {
207 //startup worker threads 210 //startup worker threads
208 for (uint i = 0; i < m_WorkerThreadCount; i++) 211 for (uint i = 0; i < m_WorkerThreadCount; i++)
209 { 212 {
210 m_workerThreads[i] 213 m_workerThreads[i]
211 = Watchdog.StartThread( 214 = Watchdog.StartThread(
212 PoolWorkerJob, 215 PoolWorkerJob,
213 String.Format("PollServiceWorkerThread{0}", i), 216 string.Format("PollServiceWorkerThread{0}:{1}", i, m_server.Port),
214 ThreadPriority.Normal, 217 ThreadPriority.Normal,
215 false, 218 false,
216 false, 219 false,
@@ -220,7 +223,7 @@ namespace OpenSim.Framework.Servers.HttpServer
220 223
221 m_retrysThread = Watchdog.StartThread( 224 m_retrysThread = Watchdog.StartThread(
222 this.CheckRetries, 225 this.CheckRetries,
223 "PollServiceWatcherThread", 226 string.Format("PollServiceWatcherThread:{0}", m_server.Port),
224 ThreadPriority.Normal, 227 ThreadPriority.Normal,
225 false, 228 false,
226 true, 229 true,
@@ -228,7 +231,6 @@ namespace OpenSim.Framework.Servers.HttpServer
228 1000 * 60 * 10); 231 1000 * 60 * 10);
229 } 232 }
230 233
231
232 private void ReQueueEvent(PollServiceHttpRequest req) 234 private void ReQueueEvent(PollServiceHttpRequest req)
233 { 235 {
234 if (m_running) 236 if (m_running)
@@ -279,14 +281,14 @@ namespace OpenSim.Framework.Servers.HttpServer
279 } 281 }
280 } 282 }
281 283
282 ~PollServiceRequestManager() 284 public void Stop()
283 { 285 {
284 m_running = false; 286 m_running = false;
285// m_timeout = -10000; // cause all to expire 287// m_timeout = -10000; // cause all to expire
286 Thread.Sleep(1000); // let the world move 288 Thread.Sleep(1000); // let the world move
287 289
288 foreach (Thread t in m_workerThreads) 290 foreach (Thread t in m_workerThreads)
289 Watchdog.AbortThread(t.ManagedThreadId); 291 Watchdog.AbortThread(t.ManagedThreadId);
290 292
291 try 293 try
292 { 294 {