Changeset 7116

Timestamp:

Nov 15, 2008, 9:20:19 PM (12 years ago)

Author:

charles

Message:

(libT) #1471: upload speed is not given enough weight when rechoking
M libtransmission/peer-mgr.c

File:

• branches/1.4x/libtransmission/peer-mgr.c (modified) (3 diffs)

branches/1.4x/libtransmission/peer-mgr.c

@@ -1843 +1843 @@
     unsigned int    doUnchoke    : 1;
     unsigned int    isInterested : 1;
-    double          rateToClient;
-    double          rateToPeer;
+    unsigned int    isChoked     : 1;
+    int             rate;
     tr_peer *       peer;
 };
 
 static int
-tr_compareDouble( double a,
-                  double b )
-{
-    if( a < b ) return -1;
-    if( a > b ) return 1;
-    return 0;
-}
-
-static int
 compareChoke( const void * va,
               const void * vb )
@@ -1863 +1854 @@
     const struct ChokeData * a = va;
     const struct ChokeData * b = vb;
-    int                      diff = 0;
-
-    if( diff == 0 ) /* prefer higher dl speeds */
-        diff = -tr_compareDouble( a->rateToClient, b->rateToClient );
-    if( diff == 0 ) /* prefer higher ul speeds */
-        diff = -tr_compareDouble( a->rateToPeer, b->rateToPeer );
-    if( diff == 0 ) /* prefer unchoked */
-        diff = (int)a->peer->peerIsChoked - (int)b->peer->peerIsChoked;
-
-    return diff;
+
+    if( a->rate != b->rate ) /* prefer higher overall speeds */
+        return a->rate > b->rate ? -1 : 1;
+
+    if( a->isChoked != b->isChoked ) /* prefer unchoked */
+        return a->isChoked ? 1 : -1;
+
+    return 0;
 }
 
@@ -1913 +1902 @@
             n->peer         = peer;
             n->isInterested = peer->peerIsInterested;
-            n->rateToPeer   = tr_peerGetPieceSpeed( peer, TR_CLIENT_TO_PEER );
-            n->rateToClient = tr_peerGetPieceSpeed( peer, TR_PEER_TO_CLIENT );
+            n->isChoked     = peer->peerIsChoked;
+            n->rate = (int)(tr_peerGetPieceSpeed( peer, TR_CLIENT_TO_PEER )
+                            + tr_peerGetPieceSpeed( peer, TR_PEER_TO_CLIENT ) );
         }
     }