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

revert last commit which seems to conflict with DoubleQueue internals. The random crash might be in DoubleQueue instead. See http://pastebin.com/XhNBNqsc

cpu-performance
dahlia 2013-07-16 02:03:01 -07:00
parent 70aa77f520
commit 6dd454240f
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
View File

@ -254,13 +254,10 @@ namespace OpenSim.Region.ClientStack.Linden
} }
} }
lock (m_queue) if (highPriority)
{ m_queue.EnqueueHigh(reqinfo);
if (highPriority) else
m_queue.EnqueueHigh(reqinfo); m_queue.EnqueueLow(reqinfo);
else
m_queue.EnqueueLow(reqinfo);
}
}; };
NoEvents = (x, y) => NoEvents = (x, y) =>
@ -348,9 +345,7 @@ namespace OpenSim.Region.ClientStack.Linden
{ {
Watchdog.UpdateThread(); Watchdog.UpdateThread();
aPollRequest poolreq = null; aPollRequest poolreq = m_queue.Dequeue();
lock (m_queue)
poolreq = m_queue.Dequeue();
if (poolreq != null && poolreq.thepoll != null) if (poolreq != null && poolreq.thepoll != null)
poolreq.thepoll.Process(poolreq); poolreq.thepoll.Process(poolreq);