diff options
author | Justin Clark-Casey (justincc) | 2014-10-10 00:58:16 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2014-11-25 23:21:37 +0000 |
commit | 40314b56f28c5bdf186d7ba81b377c5011777a20 (patch) | |
tree | c5f6bb637ad41900f88a262eae361d3c69fe99fd /OpenSim/Region/ClientStack/Linden/UDP/TokenBucket.cs | |
parent | minor: remove warnings from unused fields in LocalGridServicesConnector (diff) | |
download | opensim-SC_OLD-40314b56f28c5bdf186d7ba81b377c5011777a20.zip opensim-SC_OLD-40314b56f28c5bdf186d7ba81b377c5011777a20.tar.gz opensim-SC_OLD-40314b56f28c5bdf186d7ba81b377c5011777a20.tar.bz2 opensim-SC_OLD-40314b56f28c5bdf186d7ba81b377c5011777a20.tar.xz |
Remove the unnecessary intermediate total token bucket.
This only had one child, which is the 'adaptive' token bucket.
So from testing and currently analysis, we can use that bucket directly which simplifies the code.
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden/UDP/TokenBucket.cs')
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/TokenBucket.cs | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/TokenBucket.cs b/OpenSim/Region/ClientStack/Linden/UDP/TokenBucket.cs index 87ec5fb..fbc40a6 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/TokenBucket.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/TokenBucket.cs | |||
@@ -352,13 +352,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
352 | m_dripRate = OpenSim.Framework.Util.Clamp<Int64>(value,m_minimumFlow,MaxDripRate); | 352 | m_dripRate = OpenSim.Framework.Util.Clamp<Int64>(value,m_minimumFlow,MaxDripRate); |
353 | m_burstRate = (Int64)((double)m_dripRate * m_quantumsPerBurst); | 353 | m_burstRate = (Int64)((double)m_dripRate * m_quantumsPerBurst); |
354 | if (m_parent != null) | 354 | if (m_parent != null) |
355 | m_parent.RegisterRequest(this,m_dripRate); | 355 | m_parent.RegisterRequest(this, m_dripRate); |
356 | } | 356 | } |
357 | } | 357 | } |
358 | 358 | ||
359 | // <summary> | ||
360 | // | ||
361 | // </summary> | ||
362 | public AdaptiveTokenBucket(string identifier, TokenBucket parent, Int64 maxDripRate, bool enabled) | 359 | public AdaptiveTokenBucket(string identifier, TokenBucket parent, Int64 maxDripRate, bool enabled) |
363 | : base(identifier, parent, maxDripRate) | 360 | : base(identifier, parent, maxDripRate) |
364 | { | 361 | { |