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

Timestamp:

Mar 29, 2011, 3:23:54 PM (11 years ago)

Author:

jordan

Message:

(trunk libT) don't cache unininteresting peer addresses between sessions

For example, if we're both seeds, or if the peer is not connectible, don't bother caching it for the next session. If it's still alive, we'll find it up through DHT or tracker announces next time around. As with r12253, this commit's intention is to reduce the number of unproductive peer_atoms that we waste time trying to connect to.

File:

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

trunk/libtransmission/peer-mgr.c

@@ -2284 +2284 @@
 }
 
+static bool
+isAtomInteresting( const tr_torrent * tor, struct peer_atom * atom )
+{
+    if( tr_torrentIsSeed( tor ) && atomIsSeed( atom ) )
+        return false;
+
+    if( peerIsInUse( tor->torrentPeers, atom ) )
+        return true;
+
+    if( isAtomBlocklisted( tor->session, atom ) )
+        return false;
+
+    if( atom->flags2 & MYFLAG_BANNED )
+        return false;
+
+    return true;
+}
+
 int
 tr_peerMgrGetPeers( tr_torrent   * tor,
@@ -2303 +2321 @@
     assert( setme_pex != NULL );
     assert( af==TR_AF_INET || af==TR_AF_INET6 );
-    assert( list_mode==TR_PEERS_CONNECTED || list_mode==TR_PEERS_ALL );
+    assert( list_mode==TR_PEERS_CONNECTED || list_mode==TR_PEERS_INTERESTING );
 
     managerLock( t->manager );
@@ -2320 +2338 @@
             atoms[i] = peers[i]->atom;
     }
-    else /* TR_PEERS_ALL */
-    {
-        const struct peer_atom ** atomsBase = (const struct peer_atom**) tr_ptrArrayBase( &t->pool );
-        atomCount = tr_ptrArraySize( &t->pool );
-        atoms = tr_memdup( atomsBase, atomCount * sizeof( struct peer_atom * ) );
+    else /* TR_PEERS_INTERESTING */
+    {
+        int i;
+        struct peer_atom ** atomBase = (struct peer_atom**) tr_ptrArrayBase( &t->pool );
+        n = tr_ptrArraySize( &t->pool );
+        atoms = tr_new( struct peer_atom *, n );
+        for( i=0; i<n; ++i )
+            if( isAtomInteresting( tor, atomBase[i] ) )
+                atoms[atomCount++] = atomBase[i];
     }