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

Change the PacketQueue to use the stored size as well

0.6.1-post-fixes
Melanie Thielker 2008-12-17 19:01:47 +00:00
parent 0d3a9b45ae
commit 7ef5a79fef
1 changed files with 16 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs
View File

@ -345,9 +345,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
LLQueItem qpack = ResendOutgoingPacketQueue.Dequeue(); LLQueItem qpack = ResendOutgoingPacketQueue.Dequeue();
SendQueue.Enqueue(qpack); SendQueue.Enqueue(qpack);
int qpackSize = qpack.Packet.ToBytes().Length; TotalThrottle.AddBytes(qpack.Length);
TotalThrottle.AddBytes(qpackSize); ResendThrottle.AddBytes(qpack.Length);
ResendThrottle.AddBytes(qpackSize);
qchanged = true; qchanged = true;
} }
@ -357,9 +356,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
LLQueItem qpack = LandOutgoingPacketQueue.Dequeue(); LLQueItem qpack = LandOutgoingPacketQueue.Dequeue();
SendQueue.Enqueue(qpack); SendQueue.Enqueue(qpack);
int qpackSize = qpack.Packet.ToBytes().Length; TotalThrottle.AddBytes(qpack.Length);
TotalThrottle.AddBytes(qpackSize); LandThrottle.AddBytes(qpack.Length);
LandThrottle.AddBytes(qpackSize);
qchanged = true; qchanged = true;
} }
@ -368,9 +366,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
LLQueItem qpack = WindOutgoingPacketQueue.Dequeue(); LLQueItem qpack = WindOutgoingPacketQueue.Dequeue();
SendQueue.Enqueue(qpack); SendQueue.Enqueue(qpack);
int qpackSize = qpack.Packet.ToBytes().Length; TotalThrottle.AddBytes(qpack.Length);
TotalThrottle.AddBytes(qpackSize); WindThrottle.AddBytes(qpack.Length);
WindThrottle.AddBytes(qpackSize);
qchanged = true; qchanged = true;
} }
@ -379,9 +376,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
LLQueItem qpack = CloudOutgoingPacketQueue.Dequeue(); LLQueItem qpack = CloudOutgoingPacketQueue.Dequeue();
SendQueue.Enqueue(qpack); SendQueue.Enqueue(qpack);
int qpackSize = qpack.Packet.ToBytes().Length; TotalThrottle.AddBytes(qpack.Length);
TotalThrottle.AddBytes(qpackSize); CloudThrottle.AddBytes(qpack.Length);
CloudThrottle.AddBytes(qpackSize);
qchanged = true; qchanged = true;
} }
@ -399,9 +395,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
SendQueue.Enqueue(qpack); SendQueue.Enqueue(qpack);
} }
int qpackSize = qpack.Packet.ToBytes().Length; TotalThrottle.AddBytes(qpack.Length);
TotalThrottle.AddBytes(qpackSize); TaskThrottle.AddBytes(qpack.Length);
TaskThrottle.AddBytes(qpackSize);
qchanged = true; qchanged = true;
} }
@ -410,9 +405,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
LLQueItem qpack = TextureOutgoingPacketQueue.Dequeue(); LLQueItem qpack = TextureOutgoingPacketQueue.Dequeue();
SendQueue.Enqueue(qpack); SendQueue.Enqueue(qpack);
int qpackSize = qpack.Packet.ToBytes().Length; TotalThrottle.AddBytes(qpack.Length);
TotalThrottle.AddBytes(qpackSize); TextureThrottle.AddBytes(qpack.Length);
TextureThrottle.AddBytes(qpackSize);
qchanged = true; qchanged = true;
} }
@ -421,9 +415,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
LLQueItem qpack = AssetOutgoingPacketQueue.Dequeue(); LLQueItem qpack = AssetOutgoingPacketQueue.Dequeue();
SendQueue.Enqueue(qpack); SendQueue.Enqueue(qpack);
int qpackSize = qpack.Packet.ToBytes().Length; TotalThrottle.AddBytes(qpack.Length);
TotalThrottle.AddBytes(qpackSize); AssetThrottle.AddBytes(qpack.Length);
AssetThrottle.AddBytes(qpackSize);
qchanged = true; qchanged = true;
} }
} }
@ -451,8 +444,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
try try
{ {
Monitor.Enter(this); Monitor.Enter(this);
throttle.AddBytes(item.Packet.ToBytes().Length); throttle.AddBytes(item.Length);
TotalThrottle.AddBytes(item.Packet.ToBytes().Length); TotalThrottle.AddBytes(item.Length);
SendQueue.Enqueue(item); SendQueue.Enqueue(item);
} }
catch (Exception e) catch (Exception e)