aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Servers/HttpServer
diff options
context:
space:
mode:
authorBlueWall2013-01-23 08:16:18 -0500
committerBlueWall2013-01-23 08:16:18 -0500
commit2841ed05cf003fef8dc820d0327c1fcce0d76e93 (patch)
tree2d3647e4ffad8220e5b30fbdfbf7b3a36be0597c /OpenSim/Framework/Servers/HttpServer
parentAdd additional return status (diff)
parentBulletSim: Tweeks to vehicle motion. (diff)
downloadopensim-SC_OLD-2841ed05cf003fef8dc820d0327c1fcce0d76e93.zip
opensim-SC_OLD-2841ed05cf003fef8dc820d0327c1fcce0d76e93.tar.gz
opensim-SC_OLD-2841ed05cf003fef8dc820d0327c1fcce0d76e93.tar.bz2
opensim-SC_OLD-2841ed05cf003fef8dc820d0327c1fcce0d76e93.tar.xz
Merge branch 'master' of /home/opensim/var/repo/opensim
Diffstat (limited to 'OpenSim/Framework/Servers/HttpServer')
-rw-r--r--OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs3
-rw-r--r--OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs17
2 files changed, 15 insertions, 5 deletions
diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
index cf1c753..b24336d 100644
--- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
@@ -1750,6 +1750,7 @@ namespace OpenSim.Framework.Servers.HttpServer
1750 1750
1751 // Long Poll Service Manager with 3 worker threads a 25 second timeout for no events 1751 // Long Poll Service Manager with 3 worker threads a 25 second timeout for no events
1752 m_PollServiceManager = new PollServiceRequestManager(this, 3, 25000); 1752 m_PollServiceManager = new PollServiceRequestManager(this, 3, 25000);
1753 m_PollServiceManager.Start();
1753 HTTPDRunning = true; 1754 HTTPDRunning = true;
1754 1755
1755 //HttpListenerContext context; 1756 //HttpListenerContext context;
@@ -1800,6 +1801,8 @@ namespace OpenSim.Framework.Servers.HttpServer
1800 HTTPDRunning = false; 1801 HTTPDRunning = false;
1801 try 1802 try
1802 { 1803 {
1804 m_PollServiceManager.Stop();
1805
1803 m_httpListener2.ExceptionThrown -= httpServerException; 1806 m_httpListener2.ExceptionThrown -= httpServerException;
1804 //m_httpListener2.DisconnectHandler = null; 1807 //m_httpListener2.DisconnectHandler = null;
1805 1808
diff --git a/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs b/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
index 8d50151..3e84c55 100644
--- a/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
+++ b/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
@@ -45,19 +45,26 @@ namespace OpenSim.Framework.Servers.HttpServer
45 private uint m_WorkerThreadCount = 0; 45 private uint m_WorkerThreadCount = 0;
46 private Thread[] m_workerThreads; 46 private Thread[] m_workerThreads;
47 private PollServiceWorkerThread[] m_PollServiceWorkerThreads; 47 private PollServiceWorkerThread[] m_PollServiceWorkerThreads;
48 private bool m_running = true; 48 private volatile bool m_running = true;
49 private int m_pollTimeout;
49 50
50 public PollServiceRequestManager(BaseHttpServer pSrv, uint pWorkerThreadCount, int pTimeout) 51 public PollServiceRequestManager(BaseHttpServer pSrv, uint pWorkerThreadCount, int pTimeout)
51 { 52 {
52 m_server = pSrv; 53 m_server = pSrv;
53 m_WorkerThreadCount = pWorkerThreadCount; 54 m_WorkerThreadCount = pWorkerThreadCount;
55 m_pollTimeout = pTimeout;
56 }
57
58 public void Start()
59 {
60 m_running = true;
54 m_workerThreads = new Thread[m_WorkerThreadCount]; 61 m_workerThreads = new Thread[m_WorkerThreadCount];
55 m_PollServiceWorkerThreads = new PollServiceWorkerThread[m_WorkerThreadCount]; 62 m_PollServiceWorkerThreads = new PollServiceWorkerThread[m_WorkerThreadCount];
56 63
57 //startup worker threads 64 //startup worker threads
58 for (uint i = 0; i < m_WorkerThreadCount; i++) 65 for (uint i = 0; i < m_WorkerThreadCount; i++)
59 { 66 {
60 m_PollServiceWorkerThreads[i] = new PollServiceWorkerThread(m_server, pTimeout); 67 m_PollServiceWorkerThreads[i] = new PollServiceWorkerThread(m_server, m_pollTimeout);
61 m_PollServiceWorkerThreads[i].ReQueue += ReQueueEvent; 68 m_PollServiceWorkerThreads[i].ReQueue += ReQueueEvent;
62 69
63 m_workerThreads[i] 70 m_workerThreads[i]
@@ -136,8 +143,10 @@ namespace OpenSim.Framework.Servers.HttpServer
136 143
137 } 144 }
138 145
139 ~PollServiceRequestManager() 146 public void Stop()
140 { 147 {
148 m_running = false;
149
141 foreach (object o in m_requests) 150 foreach (object o in m_requests)
142 { 151 {
143 PollServiceHttpRequest req = (PollServiceHttpRequest) o; 152 PollServiceHttpRequest req = (PollServiceHttpRequest) o;
@@ -151,8 +160,6 @@ namespace OpenSim.Framework.Servers.HttpServer
151 { 160 {
152 t.Abort(); 161 t.Abort();
153 } 162 }
154
155 m_running = false;
156 } 163 }
157 } 164 }
158} \ No newline at end of file 165} \ No newline at end of file