Changeset 7222

Timestamp:

Dec 1, 2008, 4:47:59 PM (14 years ago)

Author:

charles

Message:

(libT) possible fix for #1545: "1.41b1: speed temporarily jumps to 2x the upload limit"

File:

• branches/1.4x/libtransmission/bandwidth.c (modified) (1 diff)

branches/1.4x/libtransmission/bandwidth.c

@@ -258 +258 @@
         const double desiredSpeed = b->band[dir].desiredSpeed;
         const double pulseCount = ( HISTORY_MSEC - period_msec ) / (double)period_msec;
-        const double nextPulseSpeed = desiredSpeed * ( pulseCount + 1 ) - ( currentSpeed * pulseCount );
-        b->band[dir].bytesLeft = MAX( 0.0, nextPulseSpeed * 1024.0 * period_msec / 1000.0 );
+        double nextPulseSpeed = desiredSpeed * ( pulseCount + 1 ) - ( currentSpeed * pulseCount );
+
+        /* clamp the speed to prevent oscillation */
+        const double minSpeed = desiredSpeed * 0.8;
+        const double maxSpeed = desiredSpeed * 1.2;
+        nextPulseSpeed = MAX( minSpeed, nextPulseSpeed );
+        nextPulseSpeed = MIN( maxSpeed, nextPulseSpeed );
+
+        b->band[dir].bytesLeft = nextPulseSpeed * 1024.0 * period_msec / 1000.0;
 
 #ifdef DEBUG_DIRECTION