From 5e9da4daabc49250af9c0ec810b1290c74bad885 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Thu, 1 Oct 2009 21:08:17 +0100
Subject: Add OnQueueEmpty event to the packet layers. No user functinality yet

---
 OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs')

diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs b/OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs
index 67ece75..801e0c5 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs
@@ -129,6 +129,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         //
         public event PacketStats OnPacketStats;
         public event PacketDrop OnPacketDrop;
+        public event QueueEmpty OnQueueEmpty;
 
         
         //private SynchronizeClientHandler m_SynchronizeClient = null;
@@ -172,6 +173,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
             m_PacketQueue = new LLPacketQueue(client.AgentId, userSettings);
 
+            m_PacketQueue.OnQueueEmpty += TriggerOnQueueEmpty;
+
             m_AckTimer.Elapsed += AckTimerElapsed;
             m_AckTimer.Start();
         }
@@ -769,6 +772,16 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             handlerPacketDrop(packet, id);
         }
 
+        private void TriggerOnQueueEmpty(ThrottleOutPacketType queue)
+        {
+            QueueEmpty handlerQueueEmpty = OnQueueEmpty;
+
+            if (handlerQueueEmpty == null)
+                return;
+
+            handlerQueueEmpty(queue);
+        }
+
         // Convert the packet to bytes and stuff it onto the send queue
         //
         public void ProcessOutPacket(LLQueItem item)
-- 
cgit v1.1


From 54a912bb9cd5148abfa5eb68b0146ae3b04051a3 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Thu, 1 Oct 2009 22:35:57 +0100
Subject: Add a method to determine the count of packets in a throttle

---
 OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs')

diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs b/OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs
index 801e0c5..37f6ca7 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs
@@ -863,5 +863,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             m_PacketQueue.Close();
             Thread.CurrentThread.Abort();
         }
+
+        public int GetQueueCount(ThrottleOutPacketType queue)
+        {
+            return m_PacketQueue.GetQueueCount(queue);
+        }
     }
 }
-- 
cgit v1.1