From d38f33736c371cf8c09d78ee5c42b8cc943bb1d7 Mon Sep 17 00:00:00 2001
From: John Hurliman
Date: Tue, 20 Oct 2009 14:41:20 -0700
Subject: * Removed the throttle speed optimizations to see if it brings
stability back * Changed the outgoing packet handler to use a real function
instead of a closure and to track time on a per-client basis instead of a
global basis
---
.../Region/ClientStack/LindenUDP/LLUDPClient.cs | 25 ++++++++++++++--------
1 file changed, 16 insertions(+), 9 deletions(-)
(limited to 'OpenSim/Region/ClientStack/LindenUDP/LLUDPClient.cs')
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUDPClient.cs b/OpenSim/Region/ClientStack/LindenUDP/LLUDPClient.cs
index 4a3a04e..ec74188 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLUDPClient.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLUDPClient.cs
@@ -101,6 +101,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
public bool IsPaused = true;
/// Environment.TickCount when the last packet was received for this client
public int TickLastPacketReceived;
+ /// Environment.TickCount of the last time the outgoing packet handler executed for this client
+ public int TickLastOutgoingPacketHandler;
/// Timer granularity. This is set to the measured resolution of Environment.TickCount
public readonly float G;
@@ -320,27 +322,32 @@ namespace OpenSim.Region.ClientStack.LindenUDP
bucket.MaxBurst = total;
bucket = m_throttleCategories[(int)ThrottleOutPacketType.Resend];
- bucket.DripRate = bucket.MaxBurst = resend;
+ bucket.DripRate = resend;
+ bucket.MaxBurst = resend;
bucket = m_throttleCategories[(int)ThrottleOutPacketType.Land];
- bucket.DripRate = bucket.MaxBurst = land;
+ bucket.DripRate = land;
+ bucket.MaxBurst = land;
bucket = m_throttleCategories[(int)ThrottleOutPacketType.Wind];
- bucket.DripRate = bucket.MaxBurst = wind;
+ bucket.DripRate = wind;
+ bucket.MaxBurst = wind;
bucket = m_throttleCategories[(int)ThrottleOutPacketType.Cloud];
- bucket.DripRate = bucket.MaxBurst = cloud;
+ bucket.DripRate = cloud;
+ bucket.MaxBurst = cloud;
bucket = m_throttleCategories[(int)ThrottleOutPacketType.Asset];
- bucket.DripRate = bucket.MaxBurst = asset;
+ bucket.DripRate = asset;
+ bucket.MaxBurst = asset;
bucket = m_throttleCategories[(int)ThrottleOutPacketType.Task];
- bucket.DripRate = task + state + texture;
- bucket.MaxBurst = task + state + texture;
+ bucket.DripRate = task + state;
+ bucket.MaxBurst = task + state;
bucket = m_throttleCategories[(int)ThrottleOutPacketType.State];
- bucket.DripRate = state + texture;
- bucket.MaxBurst = state + texture;
+ bucket.DripRate = state;
+ bucket.MaxBurst = state;
bucket = m_throttleCategories[(int)ThrottleOutPacketType.Texture];
bucket.DripRate = texture;
--
cgit v1.1