aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/BlockingQueue.cs
diff options
context:
space:
mode:
authorDiva Canto2013-07-17 11:19:36 -0700
committerDiva Canto2013-07-17 11:19:36 -0700
commite46459ef21e1ee5ceaeca70365a7c881d33b09ce (patch)
tree519428c7148d85f6d8b114710928fb41f2edbbfd /OpenSim/Framework/BlockingQueue.cs
parentRemoved the MapItems thread. Redirected the map items requests to the service... (diff)
downloadopensim-SC_OLD-e46459ef21e1ee5ceaeca70365a7c881d33b09ce.zip
opensim-SC_OLD-e46459ef21e1ee5ceaeca70365a7c881d33b09ce.tar.gz
opensim-SC_OLD-e46459ef21e1ee5ceaeca70365a7c881d33b09ce.tar.bz2
opensim-SC_OLD-e46459ef21e1ee5ceaeca70365a7c881d33b09ce.tar.xz
Cleared up much confusion in PollServiceRequestManager. Here's the history:
When Melanie added the web fetch inventory throttle to core, she made the long poll requests (EQs) effectively be handled on an active loop. All those requests, if they existed, were being constantly dequeued, checked for events (which most often they didn't have), and requeued again. This was an active loop thread on a 100ms cycle! This fixes the issue. Now the inventory requests, if they aren't ready to be served, are placed directly back in the queue, but the long poll requests aren't placed there until there are events ready to be sent or timeout has been reached. This puts the LongPollServiceWatcherThread back to 1sec cycle, as it was before.
Diffstat (limited to 'OpenSim/Framework/BlockingQueue.cs')
-rw-r--r--OpenSim/Framework/BlockingQueue.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Framework/BlockingQueue.cs b/OpenSim/Framework/BlockingQueue.cs
index aef1192..e607e64 100644
--- a/OpenSim/Framework/BlockingQueue.cs
+++ b/OpenSim/Framework/BlockingQueue.cs
@@ -76,7 +76,7 @@ namespace OpenSim.Framework
76 { 76 {
77 lock (m_queueSync) 77 lock (m_queueSync)
78 { 78 {
79 if (m_queue.Count < 1 && m_pqueue.Count < 1) 79 while (m_queue.Count < 1 && m_pqueue.Count < 1)
80 { 80 {
81 Monitor.Wait(m_queueSync, msTimeout); 81 Monitor.Wait(m_queueSync, msTimeout);
82 } 82 }