OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

give concurrentqueue another chance

httptests
UbitUmarov 2018-01-21 20:22:28 +00:00
parent 0dbed94e13
commit ccdaebaed6
1 changed files with 9 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
View File

@ -30,13 +30,10 @@ using System.Collections;
using System.Threading; using System.Threading;
using System.Reflection; using System.Reflection;
using log4net; using log4net;
using HttpServer;
using OpenSim.Framework;
using OpenSim.Framework.Monitoring; using OpenSim.Framework.Monitoring;
using Amib.Threading; using Amib.Threading;
using System.IO;
using System.Text;
using System.Collections.Generic; using System.Collections.Generic;
using System.Collections.Concurrent;
namespace OpenSim.Framework.Servers.HttpServer namespace OpenSim.Framework.Servers.HttpServer
{ {
@ -48,7 +45,7 @@ namespace OpenSim.Framework.Servers.HttpServer
private Dictionary<PollServiceHttpRequest, Queue<PollServiceHttpRequest>> m_bycontext; private Dictionary<PollServiceHttpRequest, Queue<PollServiceHttpRequest>> m_bycontext;
private BlockingQueue<PollServiceHttpRequest> m_requests = new BlockingQueue<PollServiceHttpRequest>(); private BlockingQueue<PollServiceHttpRequest> m_requests = new BlockingQueue<PollServiceHttpRequest>();
private static Queue<PollServiceHttpRequest> m_retryRequests = new Queue<PollServiceHttpRequest>(); private static ConcurrentQueue<PollServiceHttpRequest> m_retryRequests = new ConcurrentQueue<PollServiceHttpRequest>();
private uint m_WorkerThreadCount = 0; private uint m_WorkerThreadCount = 0;
private Thread[] m_workerThreads; private Thread[] m_workerThreads;
@ -112,10 +109,7 @@ namespace OpenSim.Framework.Servers.HttpServer
private void ReQueueEvent(PollServiceHttpRequest req) private void ReQueueEvent(PollServiceHttpRequest req)
{ {
if (m_running) if (m_running)
{ m_retryRequests.Enqueue(req);
lock (m_retryRequests)
m_retryRequests.Enqueue(req);
}
} }
public void Enqueue(PollServiceHttpRequest req) public void Enqueue(PollServiceHttpRequest req)
@ -177,16 +171,13 @@ namespace OpenSim.Framework.Servers.HttpServer
private void CheckRetries() private void CheckRetries()
{ {
PollServiceHttpRequest preq;
while (m_running) while (m_running)
{ {
Thread.Sleep(100); // let the world move .. back to faster rate Thread.Sleep(100);
Watchdog.UpdateThread(); Watchdog.UpdateThread();
lock (m_retryRequests) while (m_running && m_retryRequests.TryDequeue(out preq))
{ m_requests.Enqueue(preq);
while (m_retryRequests.Count > 0 && m_running)
m_requests.Enqueue(m_retryRequests.Dequeue());
}
} }
} }
@ -209,10 +200,9 @@ namespace OpenSim.Framework.Servers.HttpServer
try try
{ {
foreach (PollServiceHttpRequest req in m_retryRequests) PollServiceHttpRequest req;
{ while(m_retryRequests.TryDequeue(out req))
req.DoHTTPstop(m_server); req.DoHTTPstop(m_server);
}
} }
catch catch
{ {
@ -220,8 +210,6 @@ namespace OpenSim.Framework.Servers.HttpServer
PollServiceHttpRequest wreq; PollServiceHttpRequest wreq;
m_retryRequests.Clear();
while (m_requests.Count() > 0) while (m_requests.Count() > 0)
{ {
try try