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

* Quelled a Log format exception in the logging routines.

Browse Source 
* Tweaked some esoteric throttle settings
* Removed AgentThrottle from the unsupported packet list.
This commit is contained in:
Teravus Ovares
2007-11-22 21:40:53 +00:00
parent 999eec603e
commit f97aeab916
3 changed files with 25 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
View File

@@ -783,7 +783,7 @@ namespace OpenSim.Region.ClientStack
case PacketType.AgentThrottle:
OpenSim.Framework.Console.MainLog.Instance.Verbose("CLIENT", "unhandled packet " + Pack.ToString());
//OpenSim.Framework.Console.MainLog.Instance.Verbose("CLIENT", "unhandled packet " + Pack.ToString());
AgentThrottlePacket atpack = (AgentThrottlePacket)Pack;
@@ -825,6 +825,7 @@ namespace OpenSim.Region.ClientStack
tAsset = (int)BitConverter.ToSingle(throttle, j);
tall = tResend + tLand + tWind + tCloud + tTask + tTexture + tAsset;
/*
OpenSim.Framework.Console.MainLog.Instance.Verbose("CLIENT", "Client AgentThrottle - Got throttle:resendbytes=" + tResend +
" landbytes=" + tLand +
" windbytes=" + tWind +
@@ -833,6 +834,8 @@ namespace OpenSim.Region.ClientStack
" texturebytes=" + tTexture +
" Assetbytes=" + tAsset +
" Allbytes=" + tall);
*/
// Total Sanity
// Make sure that the client sent sane total values.
@@ -896,7 +899,7 @@ namespace OpenSim.Region.ClientStack
if (tAsset < AssetthrottleMin)
AssetthrottleOutbound = AssetthrottleMin;
OpenSim.Framework.Console.MainLog.Instance.Verbose("THROTTLE", "Using:resendbytes=" + ResendthrottleOutbound +
/* OpenSim.Framework.Console.MainLog.Instance.Verbose("THROTTLE", "Using:resendbytes=" + ResendthrottleOutbound +
" landbytes=" + LandthrottleOutbound +
" windbytes=" + WindthrottleOutbound +
" cloudbytes=" + CloudthrottleOutbound +
@@ -904,6 +907,7 @@ namespace OpenSim.Region.ClientStack
" texturebytes=" + TexturethrottleOutbound +
" Assetbytes=" + AssetthrottleOutbound +
" Allbytes=" + tall);
*/
}
else
{
@@ -1006,7 +1010,7 @@ namespace OpenSim.Region.ClientStack
if (tAssetResult < AssetthrottleMin)
AssetthrottleOutbound = AssetthrottleMin;
OpenSim.Framework.Console.MainLog.Instance.Verbose("THROTTLE", "Using:resendbytes=" + ResendthrottleOutbound +
/* OpenSim.Framework.Console.MainLog.Instance.Verbose("THROTTLE", "Using:resendbytes=" + ResendthrottleOutbound +
" landbytes=" + LandthrottleOutbound +
" windbytes=" + WindthrottleOutbound +
" cloudbytes=" + CloudthrottleOutbound +
@@ -1014,6 +1018,7 @@ namespace OpenSim.Region.ClientStack
" texturebytes=" + TexturethrottleOutbound +
" Assetbytes=" + AssetthrottleOutbound +
" Allbytes=" + tall);
*/
}
else

4
OpenSim/Region/ClientStack/ClientView.cs
View File

@@ -96,7 +96,7 @@ namespace OpenSim.Region.ClientStack
// TODO: Make this variable. Lower throttle on un-ack. Raise over time
// All throttle times and number of bytes are calculated by dividing by this value
private int throttleTimeDivisor = 5;
private int throttleTimeDivisor = 7;
private int throttletimems = 1000;
@@ -208,7 +208,7 @@ namespace OpenSim.Region.ClientStack
// The General overhead of the UDP protocol gets sent to the queue un-throttled by this
// so This'll pick up about around the right time.
int MaxThrottleLoops = 5550; // 50*7 packets can be dequeued at once.
int MaxThrottleLoops = 4550; // 50*7 packets can be dequeued at once.
int throttleLoops = 0;
// We're going to dequeue all of the saved up packets until