Changeset 7060

Timestamp:

Nov 6, 2008, 4:16:53 AM (12 years ago)

Author:

charles

Message:

(libT) fix r7055 bug reported by BentMyWookie?. Also, narrow the bandwidth allocator's `clamp' range to lessen oscillation

File:

• trunk/libtransmission/peer-mgr.c (modified) (3 diffs)

trunk/libtransmission/peer-mgr.c

@@ -1014 +1014 @@
             tor->activityDate = now;
             tor->uploadedCur += e->length;
-            tr_rcTransferred ( peer->pieceSpeed[TR_CLIENT_TO_PEER], e->length );
+            if( peer )
+                tr_rcTransferred ( peer->pieceSpeed[TR_CLIENT_TO_PEER], e->length );
             tr_rcTransferred ( tor->pieceSpeed[TR_CLIENT_TO_PEER], e->length );
             tr_rcTransferred ( tor->session->pieceSpeed[TR_CLIENT_TO_PEER], e->length );
@@ -1032 +1033 @@
             tor->activityDate = now;
             tr_statsAddDownloaded( tor->session, e->length );
-            tr_rcTransferred ( peer->pieceSpeed[TR_PEER_TO_CLIENT], e->length );
+            if( peer )
+                tr_rcTransferred ( peer->pieceSpeed[TR_PEER_TO_CLIENT], e->length );
             tr_rcTransferred ( tor->pieceSpeed[TR_PEER_TO_CLIENT], e->length );
             tr_rcTransferred ( tor->session->pieceSpeed[TR_PEER_TO_CLIENT], e->length );
@@ -2328 +2330 @@
     const double baseline = desiredAvgKB * 1024.0 /
                             BANDWIDTH_PULSES_PER_SECOND;
-    const double min = baseline * 0.90;
-    const double max = baseline * 1.10;
+    const double min = baseline * 0.85;
+    const double max = baseline * 1.15;
     int          i;
     double       usedBytes;