diff options
author | UbitUmarov | 2014-09-02 15:48:59 +0100 |
---|---|---|
committer | UbitUmarov | 2014-09-02 15:48:59 +0100 |
commit | 50433e089b548d3e9233b897568b7def489323fb (patch) | |
tree | 6e07ac5ce845ada8b2916736920278269079b53e /OpenSim/Region/ClientStack/Linden/UDP/ThrottleRates.cs | |
parent | make use of it in GetMeshModule, and meshs are Assets not Task itens, (diff) | |
download | opensim-SC-50433e089b548d3e9233b897568b7def489323fb.zip opensim-SC-50433e089b548d3e9233b897568b7def489323fb.tar.gz opensim-SC-50433e089b548d3e9233b897568b7def489323fb.tar.bz2 opensim-SC-50433e089b548d3e9233b897568b7def489323fb.tar.xz |
*needs testing, not that good* change throttles math using floats and not
int64, etc. Limite brust bytes to the total rate client requested times a
look ahead estimation time, Avoid queues starvation with updates waiting...
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/ThrottleRates.cs | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/ThrottleRates.cs b/OpenSim/Region/ClientStack/Linden/UDP/ThrottleRates.cs index 2b307c7..451dee5 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/ThrottleRates.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/ThrottleRates.cs | |||
@@ -62,6 +62,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
62 | /// <summary>Amount of the texture throttle to steal for the task throttle</summary> | 62 | /// <summary>Amount of the texture throttle to steal for the task throttle</summary> |
63 | public double CannibalizeTextureRate; | 63 | public double CannibalizeTextureRate; |
64 | 64 | ||
65 | public int ClientMaxRate; | ||
66 | public float BrustTime; | ||
67 | |||
65 | /// <summary> | 68 | /// <summary> |
66 | /// Default constructor | 69 | /// Default constructor |
67 | /// </summary> | 70 | /// </summary> |
@@ -80,8 +83,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
80 | Texture = throttleConfig.GetInt("texture_default", 18500); | 83 | Texture = throttleConfig.GetInt("texture_default", 18500); |
81 | Asset = throttleConfig.GetInt("asset_default", 10500); | 84 | Asset = throttleConfig.GetInt("asset_default", 10500); |
82 | 85 | ||
83 | // 2500000 bps max | 86 | Total = Resend + Land + Wind + Cloud + Task + Texture + Asset; |
84 | Total = throttleConfig.GetInt("client_throttle_max_bps",312500); | 87 | // 3000000 bps default max |
88 | ClientMaxRate = throttleConfig.GetInt("client_throttle_max_bps", 375000); | ||
89 | if (ClientMaxRate > 1000000) | ||
90 | ClientMaxRate = 1000000; // no more than 8Mbps | ||
91 | |||
92 | BrustTime = (float)throttleConfig.GetInt("client_throttle_burtsTimeMS", 10); | ||
93 | BrustTime *= 1e-3f; | ||
85 | 94 | ||
86 | AdaptiveThrottlesEnabled = throttleConfig.GetBoolean("enable_adaptive_throttles", false); | 95 | AdaptiveThrottlesEnabled = throttleConfig.GetBoolean("enable_adaptive_throttles", false); |
87 | 96 | ||