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

Timestamp:

May 10, 2011, 1:51:12 AM (11 years ago)

Author:

jordan

Message:

(trunk libT) CPU improvement in peer-mgr.c's getPeerCandidates()

getPeerCandiates() used to read through all the torrents to determine the global peer connections, and then again to determine the global peer candidates. Now this is done in one loop instead of two.

File:

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

trunk/libtransmission/peer-mgr.c

@@ -3809 +3809 @@
 getPeerCandidates( tr_session * session, int * candidateCount )
 {
-    int n;
+    int atomCount;
+    int peerCount;
     tr_torrent * tor;
     struct peer_candidate * candidates;
@@ -3818 +3819 @@
     const int maxCandidates = tr_sessionGetPeerLimit( session ) * 0.95;
 
+    /* count how many peers and atoms we've got */
+    tor= NULL;
+    atomCount = 0;
+    peerCount = 0;
+    while(( tor = tr_torrentNext( session, tor ))) {
+        atomCount += tr_ptrArraySize( &tor->torrentPeers->pool );
+        peerCount += tr_ptrArraySize( &tor->torrentPeers->peers );
+    }
+
     /* don't start any new handshakes if we're full up */
-    n = 0;
-    tor= NULL;
-    while(( tor = tr_torrentNext( session, tor )))
-        n += tr_ptrArraySize( &tor->torrentPeers->peers );
-    if( maxCandidates <= n ) {
+    if( maxCandidates <= peerCount ) {
         *candidateCount = 0;
         return NULL;
@@ -3829 +3835 @@
 
     /* allocate an array of candidates */
-    n = 0;
-    tor= NULL;
-    while(( tor = tr_torrentNext( session, tor )))
-        n += tr_ptrArraySize( &tor->torrentPeers->pool );
-    walk = candidates = tr_new( struct peer_candidate, n );
+    walk = candidates = tr_new( struct peer_candidate, atomCount );
 
     /* populate the candidate array */