diff options
author | Justin Clark-Casey (justincc) | 2011-01-21 00:38:16 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-01-21 00:38:16 +0000 |
commit | c383dbd06dd98ca96543c9bfdf9a7376a7e55cc2 (patch) | |
tree | 1cf85253c32484282141dcb99ba78f515fa025cc /OpenSim/Region/ClientStack | |
parent | minor: help text adjustment for "show queues" (diff) | |
download | opensim-SC_OLD-c383dbd06dd98ca96543c9bfdf9a7376a7e55cc2.zip opensim-SC_OLD-c383dbd06dd98ca96543c9bfdf9a7376a7e55cc2.tar.gz opensim-SC_OLD-c383dbd06dd98ca96543c9bfdf9a7376a7e55cc2.tar.bz2 opensim-SC_OLD-c383dbd06dd98ca96543c9bfdf9a7376a7e55cc2.tar.xz |
implement "show throttles" command for showing current agent throttles and the server settings.
This is in a very crude state, currently.
The LindenUDPModule was renamed LindenUDPInfoModule and moved to OptionalModules
OptionalModules was given a direct reference to OpenSim.Region.ClientStack.LindenUDP so that it can inspect specific LindenUDP settings without having to generalize those to all client views (some of which may have no concept of the settings involved).
This might be ess messy if OpenSim.Region.ClientStack.LindenUDP were a region module instead, like MXP, IRC and NPC
Diffstat (limited to 'OpenSim/Region/ClientStack')
-rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | 1 | ||||
-rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs | 8 |
2 files changed, 6 insertions, 3 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index e43e3c9..5dab1bc 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |||
@@ -368,6 +368,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
368 | #region Properties | 368 | #region Properties |
369 | 369 | ||
370 | public LLUDPClient UDPClient { get { return m_udpClient; } } | 370 | public LLUDPClient UDPClient { get { return m_udpClient; } } |
371 | public LLUDPServer UDPServer { get { return m_udpServer; } } | ||
371 | public IPEndPoint RemoteEndPoint { get { return m_udpClient.RemoteEndPoint; } } | 372 | public IPEndPoint RemoteEndPoint { get { return m_udpClient.RemoteEndPoint; } } |
372 | public UUID SecureSessionId { get { return m_secureSessionId; } } | 373 | public UUID SecureSessionId { get { return m_secureSessionId; } } |
373 | public IScene Scene { get { return m_scene; } } | 374 | public IScene Scene { get { return m_scene; } } |
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs index 571624b..df8ddbb 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs | |||
@@ -114,8 +114,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
114 | //private UDPClientCollection m_clients = new UDPClientCollection(); | 114 | //private UDPClientCollection m_clients = new UDPClientCollection(); |
115 | /// <summary>Bandwidth throttle for this UDP server</summary> | 115 | /// <summary>Bandwidth throttle for this UDP server</summary> |
116 | protected TokenBucket m_throttle; | 116 | protected TokenBucket m_throttle; |
117 | |||
117 | /// <summary>Bandwidth throttle rates for this UDP server</summary> | 118 | /// <summary>Bandwidth throttle rates for this UDP server</summary> |
118 | protected ThrottleRates m_throttleRates; | 119 | public ThrottleRates ThrottleRates { get; private set; } |
120 | |||
119 | /// <summary>Manages authentication for agent circuits</summary> | 121 | /// <summary>Manages authentication for agent circuits</summary> |
120 | private AgentCircuitManager m_circuitManager; | 122 | private AgentCircuitManager m_circuitManager; |
121 | /// <summary>Reference to the scene this UDP server is attached to</summary> | 123 | /// <summary>Reference to the scene this UDP server is attached to</summary> |
@@ -226,7 +228,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
226 | #endregion BinaryStats | 228 | #endregion BinaryStats |
227 | 229 | ||
228 | m_throttle = new TokenBucket(null, sceneThrottleBps, sceneThrottleBps); | 230 | m_throttle = new TokenBucket(null, sceneThrottleBps, sceneThrottleBps); |
229 | m_throttleRates = new ThrottleRates(configSource); | 231 | ThrottleRates = new ThrottleRates(configSource); |
230 | } | 232 | } |
231 | 233 | ||
232 | public void Start() | 234 | public void Start() |
@@ -922,7 +924,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
922 | protected virtual void AddClient(uint circuitCode, UUID agentID, UUID sessionID, IPEndPoint remoteEndPoint, AuthenticateResponse sessionInfo) | 924 | protected virtual void AddClient(uint circuitCode, UUID agentID, UUID sessionID, IPEndPoint remoteEndPoint, AuthenticateResponse sessionInfo) |
923 | { | 925 | { |
924 | // Create the LLUDPClient | 926 | // Create the LLUDPClient |
925 | LLUDPClient udpClient = new LLUDPClient(this, m_throttleRates, m_throttle, circuitCode, agentID, remoteEndPoint, m_defaultRTO, m_maxRTO); | 927 | LLUDPClient udpClient = new LLUDPClient(this, ThrottleRates, m_throttle, circuitCode, agentID, remoteEndPoint, m_defaultRTO, m_maxRTO); |
926 | IClientAPI existingClient; | 928 | IClientAPI existingClient; |
927 | 929 | ||
928 | if (!m_scene.TryGetClient(agentID, out existingClient)) | 930 | if (!m_scene.TryGetClient(agentID, out existingClient)) |