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

This implements the Caps throttler. After some testing, the system seemed to be OK with me specifying allowing 1 oversized image per 70,000b/sec with at least one. Try it out, start with a low bandwidth setting and then, set your bandwidth setting middle/high and see the difference. 

Tested with Two Clients on a region with 1800 textures all visible at once.
avinationmerge
teravus 2012-11-05 22:05:10 -05:00
parent b7b96a5e4f
commit 182b487243
1 changed files with 106 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

119
OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
View File

@ -61,7 +61,7 @@ namespace OpenSim.Region.ClientStack.Linden
public Hashtable request; public Hashtable request;
} }
public struct aPollResponse public class aPollResponse
{ {
public Hashtable response; public Hashtable response;
public int bytes; public int bytes;
@ -151,13 +151,18 @@ namespace OpenSim.Region.ClientStack.Linden
} }
// 0.125f converts from bits to bytes // 0.125f converts from bits to bytes
//int resend = (int)(BitConverter.ToSingle(adjData, pos) * 0.125f); pos += 4; //int resend = (int)(BitConverter.ToSingle(adjData, pos) * 0.125f);
// int land = (int)(BitConverter.ToSingle(adjData, pos) * 0.125f); pos += 4; //pos += 4;
// int wind = (int)(BitConverter.ToSingle(adjData, pos) * 0.125f); pos += 4; // int land = (int)(BitConverter.ToSingle(adjData, pos) * 0.125f);
// int cloud = (int)(BitConverter.ToSingle(adjData, pos) * 0.125f); pos += 4; //pos += 4;
// int task = (int)(BitConverter.ToSingle(adjData, pos) * 0.125f); pos += 4; // int wind = (int)(BitConverter.ToSingle(adjData, pos) * 0.125f);
// pos += 4;
// int cloud = (int)(BitConverter.ToSingle(adjData, pos) * 0.125f);
// pos += 4;
// int task = (int)(BitConverter.ToSingle(adjData, pos) * 0.125f);
// pos += 4;
pos = pos + 20; pos = pos + 20;
int texture = (int)(BitConverter.ToSingle(adjData, pos) * 0.125f); pos += 4; int texture = (int)(BitConverter.ToSingle(adjData, pos) * 0.125f); //pos += 4;
//int asset = (int)(BitConverter.ToSingle(adjData, pos) * 0.125f); //int asset = (int)(BitConverter.ToSingle(adjData, pos) * 0.125f);
return texture; return texture;
} }
@ -205,7 +210,7 @@ namespace OpenSim.Region.ClientStack.Linden
new Dictionary<UUID, aPollResponse>(); new Dictionary<UUID, aPollResponse>();
private Scene m_scene; private Scene m_scene;
private CapsDataThrottler m_throttler = new CapsDataThrottler(100000, 1400000,10000);
public PollServiceTextureEventArgs(UUID pId, Scene scene) : public PollServiceTextureEventArgs(UUID pId, Scene scene) :
base(null, null, null, null, pId, int.MaxValue) base(null, null, null, null, pId, int.MaxValue)
{ {
@ -214,7 +219,12 @@ namespace OpenSim.Region.ClientStack.Linden
HasEvents = (x, y) => HasEvents = (x, y) =>
{ {
lock (responses) lock (responses)
return responses.ContainsKey(x); {
bool ret = m_throttler.hasEvents(x, responses);
m_throttler.ProcessTime();
return ret;
}
}; };
GetEvents = (x, y) => GetEvents = (x, y) =>
{ {
@ -281,19 +291,27 @@ namespace OpenSim.Region.ClientStack.Linden
response["reusecontext"] = false; response["reusecontext"] = false;
lock (responses) lock (responses)
responses[requestID] = new aPollResponse() {bytes = 0,response = response}; responses[requestID] = new aPollResponse() {bytes = 0, response = response};
return; return;
} }
response = m_getTextureHandler.Handle(requestinfo.request); response = m_getTextureHandler.Handle(requestinfo.request);
lock (responses) lock (responses)
responses[requestID] = new aPollResponse() { bytes = (int)response["int_bytes"], response = response}; {
responses[requestID] = new aPollResponse()
{
bytes = (int) response["int_bytes"],
response = response
};
}
m_throttler.ProcessTime();
} }
internal void UpdateThrottle(int pimagethrottle) internal void UpdateThrottle(int pimagethrottle)
{ {
m_throttler.ThrottleBytes = pimagethrottle;
} }
} }
@ -347,4 +365,79 @@ namespace OpenSim.Region.ClientStack.Linden
} }
} }
} }
internal sealed class CapsDataThrottler
{
private volatile int currenttime = 0;
private volatile int lastTimeElapsed = 0;
private volatile int BytesSent = 0;
private int oversizedImages = 0;
public CapsDataThrottler(int pBytes, int max, int min)
{
ThrottleBytes = pBytes;
lastTimeElapsed = Util.EnvironmentTickCount();
}
public bool hasEvents(UUID key, Dictionary<UUID, GetTextureModule.aPollResponse> responses)
{
PassTime();
// Note, this is called IN LOCK
bool haskey = responses.ContainsKey(key);
if (!haskey)
{
return false;
}
GetTextureModule.aPollResponse response;
if (responses.TryGetValue(key,out response))
{
// Normal
if (BytesSent + response.bytes <= ThrottleBytes)
{
BytesSent += response.bytes;
//TimeBasedAction timeBasedAction = new TimeBasedAction { byteRemoval = response.bytes, requestId = key, timeMS = currenttime + 1000, unlockyn = false };
//m_actions.Add(timeBasedAction);
return true;
}
// Big textures
else if (response.bytes > ThrottleBytes && oversizedImages <= ((ThrottleBytes%50000) + 1))
{
Interlocked.Increment(ref oversizedImages);
BytesSent += response.bytes;
//TimeBasedAction timeBasedAction = new TimeBasedAction { byteRemoval = response.bytes, requestId = key, timeMS = currenttime + (((response.bytes % ThrottleBytes)+1)*1000) , unlockyn = false };
//m_actions.Add(timeBasedAction);
return true;
}
else
{
return false;
}
}
return haskey;
}
public void ProcessTime()
{
PassTime();
}
private void PassTime()
{
currenttime = Util.EnvironmentTickCount();
int timeElapsed = Util.EnvironmentTickCountSubtract(currenttime, lastTimeElapsed);
//processTimeBasedActions(responses);
if (Util.EnvironmentTickCountSubtract(currenttime, timeElapsed) >= 1000)
{
lastTimeElapsed = Util.EnvironmentTickCount();
BytesSent -= ThrottleBytes;
if (BytesSent < 0) BytesSent = 0;
if (BytesSent < ThrottleBytes)
{
oversizedImages = 0;
}
}
}
public int ThrottleBytes;
}
} }