* FireQueueEmpty now checks if a measurable amount of time has passed, and if not it sleeps for a small amount of time. This throttles OnQueueEmpty calls where there is no callback or the callback is doing very little work

* Changed HandleQueueEmpty()'s Monitor.TryEnter() calls to locks. We want to take our time in this function and do all the work necessary, since returning too fast will induce a sleep anyways

1 files changed, 6 insertions, 2 deletions

diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUDPClient.cs b/OpenSim/Region/ClientStack/LindenUDP/LLUDPClient.cs
index 0a090b4..71f4c47 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLUDPClient.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLUDPClient.cs
@@ -535,14 +535,18 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             ThrottleOutPacketType type = (ThrottleOutPacketType)i;
             QueueEmpty callback = OnQueueEmpty;
 
+            int start = Environment.TickCount;
+
             if (callback != null)
             {
                 try { callback(type); }
                 catch (Exception e) { m_log.Error("[LLUDPCLIENT]: OnQueueEmpty(" + type + ") threw an exception: " + e.Message, e); }
             }
 
-            // HACK: Try spending some extra time here to slow down OnQueueEmpty calls
-            //System.Threading.Thread.Sleep(100);
+            // Make sure all queue empty calls take at least a measurable amount of time,
+            // otherwise we'll peg a CPU trying to fire these too fast
+            if (Environment.TickCount == start)
+                System.Threading.Thread.Sleep((int)m_udpServer.TickCountResolution);
 
             m_onQueueEmptyRunning[i] = false;
         }