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

Remove a major bottleneck in throttling code.

0.6.1-post-fixes
Melanie Thielker 2008-12-17 09:52:52 +00:00
parent 02a28a6992
commit e394e1c06f
1 changed files with 15 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
OpenSim/Region/ClientStack/LindenUDP/LLPacketThrottle.cs
View File

@ -34,6 +34,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
private int m_currentThrottle; private int m_currentThrottle;
private const int m_throttleTimeDivisor = 7; private const int m_throttleTimeDivisor = 7;
private int m_currentBitsSent; private int m_currentBitsSent;
private int m_throttleBits;
/// <value> /// <value>
/// Value with which to multiply all the throttle fields /// Value with which to multiply all the throttle fields
@ -55,10 +56,17 @@ namespace OpenSim.Region.ClientStack.LindenUDP
public LLPacketThrottle(int min, int max, int throttle, float throttleMultiplier) public LLPacketThrottle(int min, int max, int throttle, float throttleMultiplier)
{ {
m_throttleMultiplier = throttleMultiplier; m_throttleMultiplier = throttleMultiplier;
m_maxAllowableThrottle = (int)(max * throttleMultiplier); m_maxAllowableThrottle = max;
m_minAllowableThrottle = (int)(min * throttleMultiplier); m_minAllowableThrottle = min;
m_currentThrottle = (int)(throttle * throttleMultiplier); m_currentThrottle = throttle;
m_currentBitsSent = 0; m_currentBitsSent = 0;
CalcBits();
}
public void CalcBits()
{
m_throttleBits = (int)((float)m_currentThrottle*m_throttleMultiplier/(float)m_throttleTimeDivisor);
} }
public void Reset() public void Reset()
@ -68,15 +76,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
public bool UnderLimit() public bool UnderLimit()
{ {
return (m_currentBitsSent < (m_currentThrottle/m_throttleTimeDivisor)); return m_currentBitsSent < m_throttleBits;
} }
// public int AddBits(int bits)
// {
// m_currentBitsSent += bits;
// return m_currentBitsSent;
// }
public int AddBytes(int bytes) public int AddBytes(int bytes)
{ {
m_currentBitsSent += bytes * 8; m_currentBitsSent += bytes * 8;
@ -98,20 +100,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
get { return m_currentThrottle; } get { return m_currentThrottle; }
set set
{ {
int multipliedValue = (int)(value * m_throttleMultiplier); m_currentThrottle = value;
if (multipliedValue > m_maxAllowableThrottle) CalcBits();
{
m_currentThrottle = m_maxAllowableThrottle;
}
else if (multipliedValue < m_minAllowableThrottle)
{
m_currentThrottle = m_minAllowableThrottle;
}
else
{
m_currentThrottle = multipliedValue;
}
} }
} }
} }