aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/Linden/UDP/TokenBucket.cs
diff options
context:
space:
mode:
authorMic Bowman2014-12-29 23:19:10 -0800
committerMic Bowman2014-12-29 23:19:10 -0800
commitbda8f2a2c1d702adc9e61869195a4dbcd3c6751f (patch)
treec75af4bc8f664bebebfa0aaccca178a74b728f39 /OpenSim/Region/ClientStack/Linden/UDP/TokenBucket.cs
parentEnable runtime configuration of the minimum rate for adaptive (diff)
downloadopensim-SC_OLD-bda8f2a2c1d702adc9e61869195a4dbcd3c6751f.zip
opensim-SC_OLD-bda8f2a2c1d702adc9e61869195a4dbcd3c6751f.tar.gz
opensim-SC_OLD-bda8f2a2c1d702adc9e61869195a4dbcd3c6751f.tar.bz2
opensim-SC_OLD-bda8f2a2c1d702adc9e61869195a4dbcd3c6751f.tar.xz
Change the effect of successfully acknowledged packets to bump the
adaptive throttle by a full MTU. This is consistent with some implementations of congestion control algorithms and certainly has the effect of opening the throttle window more quickly after errors. This is especially important after initial scene load when the number and size of packets is small.
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden/UDP/TokenBucket.cs')
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/TokenBucket.cs8
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/TokenBucket.cs b/OpenSim/Region/ClientStack/Linden/UDP/TokenBucket.cs
index c0cdff6..e67c0f5 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/TokenBucket.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/TokenBucket.cs
@@ -61,7 +61,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
61 61
62 /// <summary> 62 /// <summary>
63 /// </summary> 63 /// </summary>
64 protected const Int32 m_minimumDripRate = 1400; 64 protected const Int32 m_minimumDripRate = LLUDPServer.MTU;
65 65
66 /// <summary>Time of the last drip, in system ticks</summary> 66 /// <summary>Time of the last drip, in system ticks</summary>
67 protected Int32 m_lastDrip; 67 protected Int32 m_lastDrip;
@@ -447,12 +447,12 @@ namespace OpenSim.Region.ClientStack.LindenUDP
447 447
448 /// <summary> 448 /// <summary>
449 /// Reliable packets acked by the client adjust the drip rate up. 449 /// Reliable packets acked by the client adjust the drip rate up.
450 /// <param name="bytes">Number of bytes acknowledged</param> 450 /// <param name="packets">Number of packets successfully acknowledged</param>
451 /// </summary> 451 /// </summary>
452 public void AcknowledgePackets(Int32 bytes) 452 public void AcknowledgePackets(Int32 packets)
453 { 453 {
454 if (AdaptiveEnabled) 454 if (AdaptiveEnabled)
455 AdjustedDripRate = AdjustedDripRate + bytes; 455 AdjustedDripRate = AdjustedDripRate + packets * LLUDPServer.MTU;
456 } 456 }
457 } 457 }
458} \ No newline at end of file 458} \ No newline at end of file