diff options
author | Justin Clark-Casey (justincc) | 2014-10-06 23:29:41 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2014-11-25 23:18:39 +0000 |
commit | 1d33a40f59fc15bd85004cc68e802a0b274dad30 (patch) | |
tree | 0c8e3ed0119f6201adb167e07961b1d28cf9cdad /OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs | |
parent | Move information about "server agent rate" throttles into "show server thrott... (diff) | |
download | opensim-SC-1d33a40f59fc15bd85004cc68e802a0b274dad30.zip opensim-SC-1d33a40f59fc15bd85004cc68e802a0b274dad30.tar.gz opensim-SC-1d33a40f59fc15bd85004cc68e802a0b274dad30.tar.bz2 opensim-SC-1d33a40f59fc15bd85004cc68e802a0b274dad30.tar.xz |
Add "debug lludp set scene-throttle-max <value>" console command to allow us to potentially set the scene max throttle on the fly.
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs')
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs index 9dfe0e9..8ca0b1f 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs | |||
@@ -243,15 +243,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
243 | /// <summary>Incoming packets that are awaiting handling</summary> | 243 | /// <summary>Incoming packets that are awaiting handling</summary> |
244 | private OpenMetaverse.BlockingQueue<IncomingPacket> packetInbox = new OpenMetaverse.BlockingQueue<IncomingPacket>(); | 244 | private OpenMetaverse.BlockingQueue<IncomingPacket> packetInbox = new OpenMetaverse.BlockingQueue<IncomingPacket>(); |
245 | 245 | ||
246 | /// <summary></summary> | ||
247 | //private UDPClientCollection m_clients = new UDPClientCollection(); | ||
248 | /// <summary>Bandwidth throttle for this UDP server</summary> | 246 | /// <summary>Bandwidth throttle for this UDP server</summary> |
249 | protected TokenBucket m_throttle; | 247 | public TokenBucket Throttle { get; private set; } |
250 | 248 | ||
251 | /// <summary> | 249 | /// <summary> |
252 | /// Gets the maximum total drip rate allowed to all clients. | 250 | /// Gets the maximum total drip rate allowed to all clients. |
253 | /// </summary> | 251 | /// </summary> |
254 | public long MaxTotalDripRate { get { return m_throttle.RequestedDripRate; } } | 252 | public long MaxTotalDripRate { get { return Throttle.RequestedDripRate; } } |
255 | 253 | ||
256 | /// <summary>Bandwidth throttle rates for this UDP server</summary> | 254 | /// <summary>Bandwidth throttle rates for this UDP server</summary> |
257 | public ThrottleRates ThrottleRates { get; private set; } | 255 | public ThrottleRates ThrottleRates { get; private set; } |
@@ -449,7 +447,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
449 | // = new TokenBucket( | 447 | // = new TokenBucket( |
450 | // string.Format("server throttle bucket for {0}", Scene.Name), null, sceneThrottleBps); | 448 | // string.Format("server throttle bucket for {0}", Scene.Name), null, sceneThrottleBps); |
451 | 449 | ||
452 | m_throttle = new TokenBucket("server throttle bucket", null, sceneThrottleBps); | 450 | Throttle = new TokenBucket("server throttle bucket", null, sceneThrottleBps); |
453 | 451 | ||
454 | ThrottleRates = new ThrottleRates(configSource); | 452 | ThrottleRates = new ThrottleRates(configSource); |
455 | 453 | ||
@@ -1761,7 +1759,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
1761 | { | 1759 | { |
1762 | if (!Scene.TryGetClient(agentID, out client)) | 1760 | if (!Scene.TryGetClient(agentID, out client)) |
1763 | { | 1761 | { |
1764 | LLUDPClient udpClient = new LLUDPClient(this, ThrottleRates, m_throttle, circuitCode, agentID, remoteEndPoint, m_defaultRTO, m_maxRTO); | 1762 | LLUDPClient udpClient = new LLUDPClient(this, ThrottleRates, Throttle, circuitCode, agentID, remoteEndPoint, m_defaultRTO, m_maxRTO); |
1765 | 1763 | ||
1766 | client = new LLClientView(Scene, this, udpClient, sessionInfo, agentID, sessionID, circuitCode); | 1764 | client = new LLClientView(Scene, this, udpClient, sessionInfo, agentID, sessionID, circuitCode); |
1767 | client.OnLogout += LogoutHandler; | 1765 | client.OnLogout += LogoutHandler; |