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

Revert "This is a completely unreasonable thing to do, effectively defying the purpose of BlockingQueues. Trying this, to see the effect on CPU." 

This reverts commit 5232ab0496.
cpu-performance
Diva Canto 2013-07-17 20:42:38 -07:00
parent 1ba5a05cf7
commit c685cc1799
1 changed files with 41 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -46,7 +46,7 @@ namespace OpenSim.Framework.Servers.HttpServer
private readonly BaseHttpServer m_server; private readonly BaseHttpServer m_server;
private BlockingQueue<PollServiceHttpRequest> m_requests = new BlockingQueue<PollServiceHttpRequest>(); private DoubleQueue<PollServiceHttpRequest> m_requests = new DoubleQueue<PollServiceHttpRequest>();
private static Queue<PollServiceHttpRequest> m_longPollRequests = new Queue<PollServiceHttpRequest>(); private static Queue<PollServiceHttpRequest> m_longPollRequests = new Queue<PollServiceHttpRequest>();
private uint m_WorkerThreadCount = 0; private uint m_WorkerThreadCount = 0;
@ -163,7 +163,7 @@ namespace OpenSim.Framework.Servers.HttpServer
m_requests.Enqueue(m_longPollRequests.Dequeue()); m_requests.Enqueue(m_longPollRequests.Dequeue());
} }
while (m_requests.Count() > 0) while (m_requests.Count > 0)
{ {
try try
{ {
@ -185,21 +185,10 @@ namespace OpenSim.Framework.Servers.HttpServer
{ {
while (m_running) while (m_running)
{ {
Watchdog.UpdateThread(); PollServiceHttpRequest req = m_requests.Dequeue(5000);
PollServiceHttpRequest req = null;
lock (m_requests)
{
if (m_requests.Count() > 0)
req = m_requests.Dequeue();
}
if (req == null)
Thread.Sleep(100);
else
{
//PollServiceHttpRequest req = m_requests.Dequeue(5000);
//m_log.WarnFormat("[YYY]: Dequeued {0}", (req == null ? "null" : req.PollServiceArgs.Type.ToString())); //m_log.WarnFormat("[YYY]: Dequeued {0}", (req == null ? "null" : req.PollServiceArgs.Type.ToString()));
Watchdog.UpdateThread();
if (req != null) if (req != null)
{ {
try try
@ -260,5 +249,4 @@ namespace OpenSim.Framework.Servers.HttpServer
} }
} }
} }
}
} }