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

Change LowpriorityTask to be ThrottleType.Task | ThrottleType.LowPriority to make the flag nature of this value more clear.

0.6.0-stable
Melanie Thielker 2008-08-18 18:59:06 +00:00
parent 05506cff49
commit 6614eee4d4
3 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
OpenSim/Framework/ThrottleOutPacketType.cs
View File

@ -11,6 +11,9 @@ namespace OpenSim.Framework
Asset = 6, Asset = 6,
Unknown = 7, // Also doubles as 'do not throttle' Unknown = 7, // Also doubles as 'do not throttle'
Back = 8, Back = 8,
LowpriorityTask = 9
TypeMask = 15, // The mask to mask off the flags
LowPriority = 128 // Additional flags
} }
} }

6
OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
View File

@ -2364,7 +2364,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
} }
outPacket.Header.Zerocoded = true; outPacket.Header.Zerocoded = true;
OutPacket(outPacket, ThrottleOutPacketType.LowpriorityTask); OutPacket(outPacket, ThrottleOutPacketType.Task | ThrottleOutPacketType.LowPriority);
} }
/// <summary> /// <summary>
@ -2388,7 +2388,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
terse.ObjectData[0] = CreatePrimImprovedBlock(localID, position, rotation, velocity, rotationalvelocity, state); // AssetID should fall into here probably somehow... terse.ObjectData[0] = CreatePrimImprovedBlock(localID, position, rotation, velocity, rotationalvelocity, state); // AssetID should fall into here probably somehow...
terse.Header.Reliable = false; terse.Header.Reliable = false;
terse.Header.Zerocoded = true; terse.Header.Zerocoded = true;
OutPacket(terse, ThrottleOutPacketType.LowpriorityTask); OutPacket(terse, ThrottleOutPacketType.Task | ThrottleOutPacketType.LowPriority);
} }
public void SendPrimTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID, LLVector3 position, public void SendPrimTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID, LLVector3 position,
@ -2404,7 +2404,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
terse.ObjectData[0] = CreatePrimImprovedBlock(localID, position, rotation, velocity, rotationalvelocity, 0); terse.ObjectData[0] = CreatePrimImprovedBlock(localID, position, rotation, velocity, rotationalvelocity, 0);
terse.Header.Reliable = false; terse.Header.Reliable = false;
terse.Header.Zerocoded = true; terse.Header.Zerocoded = true;
OutPacket(terse, ThrottleOutPacketType.LowpriorityTask); OutPacket(terse, ThrottleOutPacketType.Task | ThrottleOutPacketType.LowPriority);
} }
public void SendAssetUploadCompleteMessage(sbyte AssetType, bool Success, LLUUID AssetFullID) public void SendAssetUploadCompleteMessage(sbyte AssetType, bool Success, LLUUID AssetFullID)

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

@ -159,7 +159,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
lock (this) lock (this)
{ {
switch (item.throttleType) switch (item.throttleType & ThrottleOutPacketType.TypeMask)
{ {
case ThrottleOutPacketType.Resend: case ThrottleOutPacketType.Resend:
ThrottleCheck(ref ResendThrottle, ref ResendOutgoingPacketQueue, item); ThrottleCheck(ref ResendThrottle, ref ResendOutgoingPacketQueue, item);
@ -168,10 +168,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
ThrottleCheck(ref TextureThrottle, ref TextureOutgoingPacketQueue, item); ThrottleCheck(ref TextureThrottle, ref TextureOutgoingPacketQueue, item);
break; break;
case ThrottleOutPacketType.Task: case ThrottleOutPacketType.Task:
ThrottleCheck(ref TaskThrottle, ref TaskOutgoingPacketQueue, item); if((item.throttleType & ThrottleOutPacketType.LowPriority) != 0)
break;
case ThrottleOutPacketType.LowpriorityTask:
ThrottleCheck(ref TaskThrottle, ref TaskLowpriorityPacketQueue, item); ThrottleCheck(ref TaskThrottle, ref TaskLowpriorityPacketQueue, item);
else
ThrottleCheck(ref TaskThrottle, ref TaskOutgoingPacketQueue, item);
break; break;
case ThrottleOutPacketType.Land: case ThrottleOutPacketType.Land:
ThrottleCheck(ref LandThrottle, ref LandOutgoingPacketQueue, item); ThrottleCheck(ref LandThrottle, ref LandOutgoingPacketQueue, item);