ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-05-15 03:15:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

add locking to internal queue in WebFetchInvDescModule; lack of which caused a random crash in a load test yesterday

Browse Source
This commit is contained in:
dahlia
2013-07-16 01:31:09 -07:00
parent 42e2a0d66e
commit 70aa77f520
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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