aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/Linden/UDP/ThrottleRates.cs
diff options
context:
space:
mode:
authorMic Bowman2014-12-29 18:46:33 -0800
committerMic Bowman2014-12-29 18:46:33 -0800
commit041a09ecb9eed43936a88312c11e9440bd3b6337 (patch)
tree302aaa42287f0171e51b461d8aa1b16f0dfc1c15 /OpenSim/Region/ClientStack/Linden/UDP/ThrottleRates.cs
parentAdd debugging code for simulating packet loss in outgoing UDP packets. The (diff)
downloadopensim-SC_OLD-041a09ecb9eed43936a88312c11e9440bd3b6337.zip
opensim-SC_OLD-041a09ecb9eed43936a88312c11e9440bd3b6337.tar.gz
opensim-SC_OLD-041a09ecb9eed43936a88312c11e9440bd3b6337.tar.bz2
opensim-SC_OLD-041a09ecb9eed43936a88312c11e9440bd3b6337.tar.xz
Enable runtime configuration of the minimum rate for adaptive
throttles. Setting adaptive_throttle_min_bps will change the minimum rate that the adapative throttles will drop to in case of network packet loss. The current rate default rate is 256kbps. The viewer can throttle rates under that amount, but the dynamic adaptation will not.
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden/UDP/ThrottleRates.cs')
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/ThrottleRates.cs12
1 files changed, 10 insertions, 2 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/ThrottleRates.cs b/OpenSim/Region/ClientStack/Linden/UDP/ThrottleRates.cs
index dd15cc7..7a2756b 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/ThrottleRates.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/ThrottleRates.cs
@@ -58,7 +58,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP
58 58
59 /// <summary>Flag used to enable adaptive throttles</summary> 59 /// <summary>Flag used to enable adaptive throttles</summary>
60 public bool AdaptiveThrottlesEnabled; 60 public bool AdaptiveThrottlesEnabled;
61 61
62 /// <summary>
63 /// Set the minimum rate that the adaptive throttles can set. The viewer
64 /// can still throttle lower than this, but the adaptive throttles will
65 /// never decrease rates below this no matter how many packets are dropped
66 /// </summary>
67 public Int64 MinimumAdaptiveThrottleRate;
68
62 /// <summary>Amount of the texture throttle to steal for the task throttle</summary> 69 /// <summary>Amount of the texture throttle to steal for the task throttle</summary>
63 public double CannibalizeTextureRate; 70 public double CannibalizeTextureRate;
64 71
@@ -84,7 +91,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
84 Total = throttleConfig.GetInt("client_throttle_max_bps", 0); 91 Total = throttleConfig.GetInt("client_throttle_max_bps", 0);
85 92
86 AdaptiveThrottlesEnabled = throttleConfig.GetBoolean("enable_adaptive_throttles", false); 93 AdaptiveThrottlesEnabled = throttleConfig.GetBoolean("enable_adaptive_throttles", false);
87 94 MinimumAdaptiveThrottleRate = throttleConfig.GetInt("adaptive_throttle_min_bps", 32000);
95
88 CannibalizeTextureRate = (double)throttleConfig.GetFloat("CannibalizeTextureRate", 0.0f); 96 CannibalizeTextureRate = (double)throttleConfig.GetFloat("CannibalizeTextureRate", 0.0f);
89 CannibalizeTextureRate = Util.Clamp<double>(CannibalizeTextureRate,0.0, 0.9); 97 CannibalizeTextureRate = Util.Clamp<double>(CannibalizeTextureRate,0.0, 0.9);
90 } 98 }