From b5ad1b7dcc3592dfa49298636948ea117132e6ff Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Tue, 5 Mar 2019 09:22:34 +0000 Subject: [PATCH] remove lludp throttle texture rate cannibal option. That rate is used by http, and beeing http is still trafic --- .../Region/ClientStack/Linden/UDP/LLUDPClient.cs | 14 -------------- .../Region/ClientStack/Linden/UDP/ThrottleRates.cs | 9 --------- 2 files changed, 23 deletions(-) diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs index d0d21527c4..2981337b2d 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs @@ -210,12 +210,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP } } - /// - /// This is the percentage of the udp texture queue to add to the task queue since - /// textures are now generally handled through http. - /// - private double m_cannibalrate = 0.0; - private ClientInfo m_info = new ClientInfo(); /// @@ -257,8 +251,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP // Create an array of token buckets for this clients different throttle categories m_throttleCategories = new TokenBucket[THROTTLE_CATEGORY_COUNT]; - m_cannibalrate = rates.CannibalizeTextureRate; - m_burst = rates.Total * rates.BrustTime; for (int i = 0; i < THROTTLE_CATEGORY_COUNT; i++) @@ -449,12 +441,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP asset = Math.Max(asset, LLUDPServer.MTU); */ - // Since most textures are now delivered through http, make it possible - // to cannibalize some of the bw from the texture throttle to use for - // the task queue (e.g. object updates) - task = task + (int)(m_cannibalrate * texture); - texture = (int)((1 - m_cannibalrate) * texture); - int total = resend + land + wind + cloud + task + texture + asset; float m_burst = total * m_burstTime; diff --git a/OpenSim/Region/ClientStack/Linden/UDP/ThrottleRates.cs b/OpenSim/Region/ClientStack/Linden/UDP/ThrottleRates.cs index f8ec97ae83..3277638697 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/ThrottleRates.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/ThrottleRates.cs @@ -66,9 +66,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP /// public Int64 MinimumAdaptiveThrottleRate; - /// Amount of the texture throttle to steal for the task throttle - public double CannibalizeTextureRate; - public int ClientMaxRate; public float BrustTime; @@ -104,12 +101,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP // AdaptiveThrottlesEnabled = throttleConfig.GetBoolean("enable_adaptive_throttles", false); AdaptiveThrottlesEnabled = false; MinimumAdaptiveThrottleRate = throttleConfig.GetInt("adaptive_throttle_min_bps", 32000); - - // http textures do use udp bandwidth setting -// CannibalizeTextureRate = (double)throttleConfig.GetFloat("CannibalizeTextureRate", 0.0f); -// CannibalizeTextureRate = Util.Clamp(CannibalizeTextureRate,0.0, 0.9); - CannibalizeTextureRate = 0f; - } catch (Exception) { } }