ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-06 01:06:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

Another technique inspired by some of the newer flow control algorithms... rather

Browse Source 
than drop exponentially to 0 (and then adjust up for the minimum flow), drop on
the delta between current rate and the minimum rate. This should smooth the fallback
to minimum.
This commit is contained in:
Mic Bowman
2014-12-30 10:39:14 -08:00
parent 75df04f0b3
commit c06100c31f
1 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
OpenSim/Region/ClientStack/Linden/UDP/TokenBucket.cs
View File

@@ -395,16 +395,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
/// The minimum rate for adaptive flow control.
/// </summary>
protected Int64 m_minimumFlow = 32000;
public Int64 MinimumFlow
{
get { return m_minimumFlow; }
set
{
m_minimumFlow = value;
TargetDripRate = Math.Max(m_minimumFlow, TargetDripRate);
AdjustedDripRate = Math.Max(m_minimumFlow, AdjustedDripRate);
}
}
/// <summary>
/// Constructor for the AdaptiveTokenBucket class
@@ -441,7 +431,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
"[ADAPTIVEBUCKET] drop {0} by {1} expired packets for {2}",
AdjustedDripRate, packets, Identifier);
AdjustedDripRate = (Int64) (AdjustedDripRate / Math.Pow(2,packets));
// AdjustedDripRate = (Int64) (AdjustedDripRate / Math.Pow(2,packets));
// Compute the fallback solely on the rate allocated beyond the minimum, this
// should smooth out the fallback to the minimum rate
AdjustedDripRate = m_minimumFlow + (Int64) ((AdjustedDripRate - m_minimumFlow) / Math.Pow(2, packets));
}
}
@@ -454,5 +448,17 @@ namespace OpenSim.Region.ClientStack.LindenUDP
if (AdaptiveEnabled)
AdjustedDripRate = AdjustedDripRate + packets * LLUDPServer.MTU;
}
/// <summary>
/// Adjust the minimum flow level for the adaptive throttle, this will drop adjusted
/// throttles back to the minimum levels
/// <param>minDripRate--the new minimum flow</param>
/// </summary>
public void ResetMinimumAdaptiveFlow(Int64 minDripRate)
{
m_minimumFlow = minDripRate;
TargetDripRate = m_minimumFlow;
AdjustedDripRate = m_minimumFlow;
}
}
}