aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs
diff options
context:
space:
mode:
authorDiva Canto2013-07-10 16:09:45 -0700
committerDiva Canto2013-07-10 16:09:45 -0700
commit1b265b213b65076ee346d85f62d2d61a72ea3ca6 (patch)
treede0bcebaaeba7057fc1ca752229e9394dace66da /OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs
parentComment out old inbound UDP throttling hack. This would cause the UDP (diff)
downloadopensim-SC_OLD-1b265b213b65076ee346d85f62d2d61a72ea3ca6.zip
opensim-SC_OLD-1b265b213b65076ee346d85f62d2d61a72ea3ca6.tar.gz
opensim-SC_OLD-1b265b213b65076ee346d85f62d2d61a72ea3ca6.tar.bz2
opensim-SC_OLD-1b265b213b65076ee346d85f62d2d61a72ea3ca6.tar.xz
Added show client-stats [first last] command to expose what viewers are requesting.
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs')
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs27
1 files changed, 13 insertions, 14 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs
index 621e0fd..7749446 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs
@@ -159,6 +159,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
159 private int m_defaultRTO = 1000; // 1sec is the recommendation in the RFC 159 private int m_defaultRTO = 1000; // 1sec is the recommendation in the RFC
160 private int m_maxRTO = 60000; 160 private int m_maxRTO = 60000;
161 161
162 private ClientInfo m_info = new ClientInfo();
163
162 /// <summary> 164 /// <summary>
163 /// Default constructor 165 /// Default constructor
164 /// </summary> 166 /// </summary>
@@ -240,20 +242,17 @@ namespace OpenSim.Region.ClientStack.LindenUDP
240 // TODO: This data structure is wrong in so many ways. Locking and copying the entire lists 242 // TODO: This data structure is wrong in so many ways. Locking and copying the entire lists
241 // of pending and needed ACKs for every client every time some method wants information about 243 // of pending and needed ACKs for every client every time some method wants information about
242 // this connection is a recipe for poor performance 244 // this connection is a recipe for poor performance
243 ClientInfo info = new ClientInfo(); 245
244 info.pendingAcks = new Dictionary<uint, uint>(); 246 m_info.resendThrottle = (int)m_throttleCategories[(int)ThrottleOutPacketType.Resend].DripRate;
245 info.needAck = new Dictionary<uint, byte[]>(); 247 m_info.landThrottle = (int)m_throttleCategories[(int)ThrottleOutPacketType.Land].DripRate;
246 248 m_info.windThrottle = (int)m_throttleCategories[(int)ThrottleOutPacketType.Wind].DripRate;
247 info.resendThrottle = (int)m_throttleCategories[(int)ThrottleOutPacketType.Resend].DripRate; 249 m_info.cloudThrottle = (int)m_throttleCategories[(int)ThrottleOutPacketType.Cloud].DripRate;
248 info.landThrottle = (int)m_throttleCategories[(int)ThrottleOutPacketType.Land].DripRate; 250 m_info.taskThrottle = (int)m_throttleCategories[(int)ThrottleOutPacketType.Task].DripRate;
249 info.windThrottle = (int)m_throttleCategories[(int)ThrottleOutPacketType.Wind].DripRate; 251 m_info.assetThrottle = (int)m_throttleCategories[(int)ThrottleOutPacketType.Asset].DripRate;
250 info.cloudThrottle = (int)m_throttleCategories[(int)ThrottleOutPacketType.Cloud].DripRate; 252 m_info.textureThrottle = (int)m_throttleCategories[(int)ThrottleOutPacketType.Texture].DripRate;
251 info.taskThrottle = (int)m_throttleCategories[(int)ThrottleOutPacketType.Task].DripRate; 253 m_info.totalThrottle = (int)m_throttleCategory.DripRate;
252 info.assetThrottle = (int)m_throttleCategories[(int)ThrottleOutPacketType.Asset].DripRate; 254
253 info.textureThrottle = (int)m_throttleCategories[(int)ThrottleOutPacketType.Texture].DripRate; 255 return m_info;
254 info.totalThrottle = (int)m_throttleCategory.DripRate;
255
256 return info;
257 } 256 }
258 257
259 /// <summary> 258 /// <summary>