aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/LindenUDP/LLUDPClient.cs
diff options
context:
space:
mode:
authorJohn Hurliman2009-10-20 14:41:20 -0700
committerJohn Hurliman2009-10-20 14:41:20 -0700
commitd38f33736c371cf8c09d78ee5c42b8cc943bb1d7 (patch)
treeddf8282ad62f955b6be80c6c8adcdcfe26ab9548 /OpenSim/Region/ClientStack/LindenUDP/LLUDPClient.cs
parentAdded try/catches in the outgoing packet handler to match the one in the inco... (diff)
downloadopensim-SC_OLD-d38f33736c371cf8c09d78ee5c42b8cc943bb1d7.zip
opensim-SC_OLD-d38f33736c371cf8c09d78ee5c42b8cc943bb1d7.tar.gz
opensim-SC_OLD-d38f33736c371cf8c09d78ee5c42b8cc943bb1d7.tar.bz2
opensim-SC_OLD-d38f33736c371cf8c09d78ee5c42b8cc943bb1d7.tar.xz
* 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
Diffstat (limited to 'OpenSim/Region/ClientStack/LindenUDP/LLUDPClient.cs')
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLUDPClient.cs25
1 files changed, 16 insertions, 9 deletions
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
101 public bool IsPaused = true; 101 public bool IsPaused = true;
102 /// <summary>Environment.TickCount when the last packet was received for this client</summary> 102 /// <summary>Environment.TickCount when the last packet was received for this client</summary>
103 public int TickLastPacketReceived; 103 public int TickLastPacketReceived;
104 /// <summary>Environment.TickCount of the last time the outgoing packet handler executed for this client</summary>
105 public int TickLastOutgoingPacketHandler;
104 106
105 /// <summary>Timer granularity. This is set to the measured resolution of Environment.TickCount</summary> 107 /// <summary>Timer granularity. This is set to the measured resolution of Environment.TickCount</summary>
106 public readonly float G; 108 public readonly float G;
@@ -320,27 +322,32 @@ namespace OpenSim.Region.ClientStack.LindenUDP
320 bucket.MaxBurst = total; 322 bucket.MaxBurst = total;
321 323
322 bucket = m_throttleCategories[(int)ThrottleOutPacketType.Resend]; 324 bucket = m_throttleCategories[(int)ThrottleOutPacketType.Resend];
323 bucket.DripRate = bucket.MaxBurst = resend; 325 bucket.DripRate = resend;
326 bucket.MaxBurst = resend;
324 327
325 bucket = m_throttleCategories[(int)ThrottleOutPacketType.Land]; 328 bucket = m_throttleCategories[(int)ThrottleOutPacketType.Land];
326 bucket.DripRate = bucket.MaxBurst = land; 329 bucket.DripRate = land;
330 bucket.MaxBurst = land;
327 331
328 bucket = m_throttleCategories[(int)ThrottleOutPacketType.Wind]; 332 bucket = m_throttleCategories[(int)ThrottleOutPacketType.Wind];
329 bucket.DripRate = bucket.MaxBurst = wind; 333 bucket.DripRate = wind;
334 bucket.MaxBurst = wind;
330 335
331 bucket = m_throttleCategories[(int)ThrottleOutPacketType.Cloud]; 336 bucket = m_throttleCategories[(int)ThrottleOutPacketType.Cloud];
332 bucket.DripRate = bucket.MaxBurst = cloud; 337 bucket.DripRate = cloud;
338 bucket.MaxBurst = cloud;
333 339
334 bucket = m_throttleCategories[(int)ThrottleOutPacketType.Asset]; 340 bucket = m_throttleCategories[(int)ThrottleOutPacketType.Asset];
335 bucket.DripRate = bucket.MaxBurst = asset; 341 bucket.DripRate = asset;
342 bucket.MaxBurst = asset;
336 343
337 bucket = m_throttleCategories[(int)ThrottleOutPacketType.Task]; 344 bucket = m_throttleCategories[(int)ThrottleOutPacketType.Task];
338 bucket.DripRate = task + state + texture; 345 bucket.DripRate = task + state;
339 bucket.MaxBurst = task + state + texture; 346 bucket.MaxBurst = task + state;
340 347
341 bucket = m_throttleCategories[(int)ThrottleOutPacketType.State]; 348 bucket = m_throttleCategories[(int)ThrottleOutPacketType.State];
342 bucket.DripRate = state + texture; 349 bucket.DripRate = state;
343 bucket.MaxBurst = state + texture; 350 bucket.MaxBurst = state;
344 351
345 bucket = m_throttleCategories[(int)ThrottleOutPacketType.Texture]; 352 bucket = m_throttleCategories[(int)ThrottleOutPacketType.Texture];
346 bucket.DripRate = texture; 353 bucket.DripRate = texture;