OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use automatic properties for Parent and TotalDripRequest in TokenBucket to make code analysis easier. No functional change.

mb-throttle-test
Justin Clark-Casey (justincc) 2014-10-10 18:38:54 +01:00
parent 40314b56f2
commit ead32de790
1 changed files with 21 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -84,12 +84,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
/// parent. The parent bucket will limit the aggregate bandwidth of all /// parent. The parent bucket will limit the aggregate bandwidth of all
/// of its children buckets /// of its children buckets
/// </summary> /// </summary>
protected TokenBucket m_parent; public TokenBucket Parent { get; protected set; }
public TokenBucket Parent
{
get { return m_parent; }
set { m_parent = value; }
}
/// <summary> /// <summary>
/// Maximum burst rate in bytes per second. This is the maximum number /// Maximum burst rate in bytes per second. This is the maximum number
@ -124,23 +119,23 @@ namespace OpenSim.Region.ClientStack.LindenUDP
protected Int64 m_dripRate; protected Int64 m_dripRate;
public virtual Int64 RequestedDripRate public virtual Int64 RequestedDripRate
{ {
get { return (m_dripRate == 0 ? m_totalDripRequest : m_dripRate); } get { return (m_dripRate == 0 ? TotalDripRequest : m_dripRate); }
set { set {
m_dripRate = (value < 0 ? 0 : value); m_dripRate = (value < 0 ? 0 : value);
m_burstRate = (Int64)((double)m_dripRate * m_quantumsPerBurst); m_burstRate = (Int64)((double)m_dripRate * m_quantumsPerBurst);
m_totalDripRequest = m_dripRate; TotalDripRequest = m_dripRate;
if (m_parent != null) if (Parent != null)
m_parent.RegisterRequest(this,m_dripRate); Parent.RegisterRequest(this,m_dripRate);
} }
} }
public virtual Int64 DripRate public virtual Int64 DripRate
{ {
get { get {
if (m_parent == null) if (Parent == null)
return Math.Min(RequestedDripRate,TotalDripRequest); return Math.Min(RequestedDripRate, TotalDripRequest);
double rate = (double)RequestedDripRate * m_parent.DripRateModifier(); double rate = (double)RequestedDripRate * Parent.DripRateModifier();
if (rate < m_minimumDripRate) if (rate < m_minimumDripRate)
rate = m_minimumDripRate; rate = m_minimumDripRate;
@ -152,12 +147,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
/// The current total of the requested maximum burst rates of /// The current total of the requested maximum burst rates of
/// this bucket's children buckets. /// this bucket's children buckets.
/// </summary> /// </summary>
protected Int64 m_totalDripRequest; public Int64 TotalDripRequest { get; protected set; }
public Int64 TotalDripRequest
{
get { return m_totalDripRequest; }
set { m_totalDripRequest = value; }
}
#endregion Properties #endregion Properties
@ -216,16 +206,16 @@ namespace OpenSim.Region.ClientStack.LindenUDP
lock (m_children) lock (m_children)
{ {
m_children[child] = request; m_children[child] = request;
// m_totalDripRequest = m_children.Values.Sum(); // TotalDripRequest = m_children.Values.Sum();
m_totalDripRequest = 0; TotalDripRequest = 0;
foreach (KeyValuePair<TokenBucket, Int64> cref in m_children) foreach (KeyValuePair<TokenBucket, Int64> cref in m_children)
m_totalDripRequest += cref.Value; TotalDripRequest += cref.Value;
} }
// Pass the new values up to the parent // Pass the new values up to the parent
if (m_parent != null) if (Parent != null)
m_parent.RegisterRequest(this,Math.Min(RequestedDripRate, TotalDripRequest)); Parent.RegisterRequest(this,Math.Min(RequestedDripRate, TotalDripRequest));
} }
/// <summary> /// <summary>
@ -239,15 +229,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP
m_children.Remove(child); m_children.Remove(child);
// m_totalDripRequest = m_children.Values.Sum(); // m_totalDripRequest = m_children.Values.Sum();
m_totalDripRequest = 0; TotalDripRequest = 0;
foreach (KeyValuePair<TokenBucket, Int64> cref in m_children) foreach (KeyValuePair<TokenBucket, Int64> cref in m_children)
m_totalDripRequest += cref.Value; TotalDripRequest += cref.Value;
} }
// Pass the new values up to the parent // Pass the new values up to the parent
if (m_parent != null) if (Parent != null)
m_parent.RegisterRequest(this,Math.Min(RequestedDripRate, TotalDripRequest)); Parent.RegisterRequest(this,Math.Min(RequestedDripRate, TotalDripRequest));
} }
/// <summary> /// <summary>
@ -336,7 +325,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
protected Int64 m_maxDripRate = 0; protected Int64 m_maxDripRate = 0;
public Int64 MaxDripRate public Int64 MaxDripRate
{ {
get { return (m_maxDripRate == 0 ? m_totalDripRequest : m_maxDripRate); } get { return (m_maxDripRate == 0 ? TotalDripRequest : m_maxDripRate); }
set { m_maxDripRate = (value == 0 ? 0 : Math.Max(value,m_minimumFlow)); } set { m_maxDripRate = (value == 0 ? 0 : Math.Max(value,m_minimumFlow)); }
} }
@ -351,8 +340,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
set { set {
m_dripRate = OpenSim.Framework.Util.Clamp<Int64>(value,m_minimumFlow,MaxDripRate); m_dripRate = OpenSim.Framework.Util.Clamp<Int64>(value,m_minimumFlow,MaxDripRate);
m_burstRate = (Int64)((double)m_dripRate * m_quantumsPerBurst); m_burstRate = (Int64)((double)m_dripRate * m_quantumsPerBurst);
if (m_parent != null) if (Parent != null)
m_parent.RegisterRequest(this, m_dripRate); Parent.RegisterRequest(this, m_dripRate);
} }
} }