Changeset 10744

Timestamp:

Jun 13, 2010, 5:17:33 PM (12 years ago)

Author:

charles

Message:

(trunk libT) speedups to comparePeerCandidates()

File:

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

trunk/libtransmission/peer-mgr.c

@@ -3275 +3275 @@
     tr_torrent * tor;
     struct peer_atom * atom;
+    tr_priority_t priority;
+    tr_bool wasRecentlyStarted;
 };
 
@@ -3300 +3302 @@
 comparePeerCandidates( const void * va, const void * vb )
 {
-    int i, ai, bi;
+    int i;
     tr_bool af, bf;
     const struct peer_candidate * a = va;
@@ -3316 +3318 @@
 
     /* prefer peers belonging to a torrent of a higher priority */
-    ai = tr_torrentGetPriority( a->tor );
-    bi = tr_torrentGetPriority( b->tor );
-    if( ai != bi )
-        return ai > bi ? -1 : 1;
+    if( a->priority != b->priority )
+        return a->priority > b->priority ? -1 : 1;
 
     /* prefer recently-started torrents */
-    af = torrentWasRecentlyStarted( a->tor );
-    bf = torrentWasRecentlyStarted( a->tor );
-    if( af != bf )
-        return af ? -1 : 1;
+    if( a->wasRecentlyStarted != b->wasRecentlyStarted )
+        return a->wasRecentlyStarted ? -1 : 1;
 
     /* prefer peers that we might have a chance of uploading to */
@@ -3397 +3395 @@
                 walk->atom = atom;
                 walk->salt = tr_cryptoWeakRandInt( 4096 );
+                walk->priority = tr_torrentGetPriority( tor );
+                walk->wasRecentlyStarted = torrentWasRecentlyStarted( tor );
                 ++walk;
             }