aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorMelanie2009-10-01 22:35:57 +0100
committerMelanie2009-10-01 22:35:57 +0100
commit54a912bb9cd5148abfa5eb68b0146ae3b04051a3 (patch)
tree191f0f876f2d9389fda297e20b98574fb8f9592b /OpenSim
parentAdd "dump asset" command to remote asset connector (the only one that uses a (diff)
downloadopensim-SC_OLD-54a912bb9cd5148abfa5eb68b0146ae3b04051a3.zip
opensim-SC_OLD-54a912bb9cd5148abfa5eb68b0146ae3b04051a3.tar.gz
opensim-SC_OLD-54a912bb9cd5148abfa5eb68b0146ae3b04051a3.tar.bz2
opensim-SC_OLD-54a912bb9cd5148abfa5eb68b0146ae3b04051a3.tar.xz
Add a method to determine the count of packets in a throttle
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/ILLPacketHandler.cs1
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs5
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs21
3 files changed, 27 insertions, 0 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/ILLPacketHandler.cs b/OpenSim/Region/ClientStack/LindenUDP/ILLPacketHandler.cs
index 5658dba..31f9580 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/ILLPacketHandler.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/ILLPacketHandler.cs
@@ -78,5 +78,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
78 void SetClientInfo(ClientInfo info); 78 void SetClientInfo(ClientInfo info);
79 void AddImportantPacket(PacketType type); 79 void AddImportantPacket(PacketType type);
80 void RemoveImportantPacket(PacketType type); 80 void RemoveImportantPacket(PacketType type);
81 int GetQueueCount(ThrottleOutPacketType queue);
81 } 82 }
82} 83}
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
863 m_PacketQueue.Close(); 863 m_PacketQueue.Close();
864 Thread.CurrentThread.Abort(); 864 Thread.CurrentThread.Abort();
865 } 865 }
866
867 public int GetQueueCount(ThrottleOutPacketType queue)
868 {
869 return m_PacketQueue.GetQueueCount(queue);
870 }
866 } 871 }
867} 872}
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs b/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs
index f08f1b6..d4d654f 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs
@@ -753,5 +753,26 @@ namespace OpenSim.Region.ClientStack.LindenUDP
753 { 753 {
754 get { return throttleMultiplier; } 754 get { return throttleMultiplier; }
755 } 755 }
756
757 public int GetQueueCount(ThrottleOutPacketType queue)
758 {
759 switch (queue)
760 {
761 case ThrottleOutPacketType.Land:
762 return LandOutgoingPacketQueue.Count;
763 case ThrottleOutPacketType.Wind:
764 return WindOutgoingPacketQueue.Count;
765 case ThrottleOutPacketType.Cloud:
766 return CloudOutgoingPacketQueue.Count;
767 case ThrottleOutPacketType.Task:
768 return TaskOutgoingPacketQueue.Count;
769 case ThrottleOutPacketType.Texture:
770 return TextureOutgoingPacketQueue.Count;
771 case ThrottleOutPacketType.Asset:
772 return AssetOutgoingPacketQueue.Count;
773 }
774
775 return 0;
776 }
756 } 777 }
757} 778}