Changeset 11307

Timestamp:

Oct 13, 2010, 3:56:25 AM (12 years ago)

Author:

charles

Message:

(trunk libT) #3596 "optimistic unchoke timer is too short" -- fixed.

File:

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

trunk/libtransmission/peer-mgr.c

@@ -49 +49 @@
     RECHOKE_PERIOD_MSEC = ( 10 * 1000 ),
 
+    /* an optimistically unchoked peer is immune from rechoking
+       for this many calls to rechokeUploads(). */
+    OPTIMISTIC_UNCHOKE_MULTIPLIER = 4,
+
     /* how frequently to reallocate bandwidth */
     BANDWIDTH_PERIOD_MSEC = 500,
@@ -180 +184 @@
 
     tr_torrent               * tor;
+    struct tr_peerMgr        * manager;
+
     tr_peer                  * optimistic; /* the optimistic peer, or NULL if none */
-    struct tr_peerMgr        * manager;
+    int                        optimisticUnchokeTimeScaler;
 
     tr_bool                    isRunning;
@@ -2710 +2716 @@
     assert( torrentIsLocked( t ) );
 
+    /* an optimistic unchoke peer's "optimistic"
+     * state lasts for N calls to rechokeUploads(). */
+    if( t->optimisticUnchokeTimeScaler > 0 )
+        t->optimisticUnchokeTimeScaler--;
+    else
+        t->optimistic = NULL;
+
     /* sort the peers by preference and rate */
     for( i = 0, size = 0; i < peerCount; ++i )
@@ -2728 +2741 @@
             tr_peerMsgsSetChoke( peer->msgs, TRUE );
         }
-        else
+        else if( peer != t->optimistic )
         {
             struct ChokeData * n = &choke[size++];
@@ -2765 +2778 @@
 
     /* optimistic unchoke */
-    if( !isMaxedOut && (i<size) )
+    if( !t->optimistic && !isMaxedOut && (i<size) )
     {
         int n;
@@ -2788 +2801 @@
             c->isChoked = FALSE;
             t->optimistic = c->peer;
+            t->optimisticUnchokeTimeScaler = OPTIMISTIC_UNCHOKE_MULTIPLIER;
         }