Changeset 3825 for trunk/libtransmission/peer-mgr.c

Timestamp:

Nov 15, 2007, 5:47:23 AM (15 years ago)

Author:

charles

Message:

more of the same

File:

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

trunk/libtransmission/peer-mgr.c

@@ -1439 +1439 @@
 {
     tr_peer * peer;
-    float rate;
-    int randomKey;
+    double rate;
     int preferred;
     int doUnchoke;
@@ -1448 +1447 @@
 compareChoke( const void * va, const void * vb )
 {
+    int i;
     const struct ChokeData * a = va;
     const struct ChokeData * b = vb;
 
+    if(( i = (int)( 10 * ( a->rate - b->rate ))))
+        return i;
+
     if( a->preferred != b->preferred )
         return a->preferred ? -1 : 1;
 
-    if( a->preferred )
-    {
-        if( a->rate > b->rate ) return -1;
-        if( a->rate < b->rate ) return 1;
-        return 0;
-    }
-    else
-    {
-        return a->randomKey - b->randomKey;
-    }
+    return 0;
 }
 
@@ -1481 +1475 @@
 getWeightedThroughput( const tr_peer * peer )
 {
-    /* FIXME: tweak this */
+    /* FIXME: tweak this? */
     return ( 1 * peer->rateToPeer )
          + ( 1 * peer->rateToClient );
@@ -1507 +1501 @@
         node->peer = peer;
         node->preferred = peer->peerIsInterested && !clientIsSnubbedBy(peer);
-        node->randomKey = tr_rand( INT_MAX );
         node->rate = getWeightedThroughput( peer );
     }