ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-06 17:32:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

give BlockingCollection another chance

Browse Source
This commit is contained in:
UbitUmarov
2018-01-21 21:02:07 +00:00
parent ccdaebaed6
commit 855dcda9c3
1 changed files with 14 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -44,7 +44,7 @@ namespace OpenSim.Framework.Servers.HttpServer
private readonly BaseHttpServer m_server;
private Dictionary<PollServiceHttpRequest, Queue<PollServiceHttpRequest>> m_bycontext;
private BlockingQueue<PollServiceHttpRequest> m_requests = new BlockingQueue<PollServiceHttpRequest>();
private BlockingCollection<PollServiceHttpRequest> m_requests = new BlockingCollection<PollServiceHttpRequest>();
private static ConcurrentQueue<PollServiceHttpRequest> m_retryRequests = new ConcurrentQueue<PollServiceHttpRequest>();
private uint m_WorkerThreadCount = 0;
@@ -166,7 +166,7 @@ namespace OpenSim.Framework.Servers.HttpServer
public void EnqueueInt(PollServiceHttpRequest req)
{
if (m_running)
m_requests.Enqueue(req);
m_requests.Add(req);
}
private void CheckRetries()
@@ -177,7 +177,7 @@ namespace OpenSim.Framework.Servers.HttpServer
Thread.Sleep(100);
Watchdog.UpdateThread();
while (m_running && m_retryRequests.TryDequeue(out preq))
m_requests.Enqueue(preq);
m_requests.Add(preq);
}
}
@@ -198,9 +198,9 @@ namespace OpenSim.Framework.Servers.HttpServer
qu.Clear();
m_bycontext.Clear();
PollServiceHttpRequest req;
try
{
PollServiceHttpRequest req;
while(m_retryRequests.TryDequeue(out req))
req.DoHTTPstop(m_server);
}
@@ -208,21 +208,17 @@ namespace OpenSim.Framework.Servers.HttpServer
{
}
PollServiceHttpRequest wreq;
while (m_requests.Count() > 0)
try
{
while(m_requests.TryTake(out req, 0))
req.DoHTTPstop(m_server);
}
catch
{
try
{
wreq = m_requests.Dequeue(0);
wreq.DoHTTPstop(m_server);
}
catch
{
}
}
m_requests.Clear();
m_requests.Dispose();
}
// work threads
@@ -231,7 +227,8 @@ namespace OpenSim.Framework.Servers.HttpServer
{
while (m_running)
{
PollServiceHttpRequest req = m_requests.Dequeue(4500);
PollServiceHttpRequest req;
m_requests.TryTake(out req, 4500);
Watchdog.UpdateThread();
if(req == null)
continue;