Changeset 9086

Timestamp:

Sep 10, 2009, 2:21:03 AM (13 years ago)

Author:

charles

Message:

(1.7x libT) #2395: caching too many peers between sessions makes startup slow and uses too much memory (KyleK, stdisease, et al)

Location:

branches/1.7x/libtransmission

Files:

• peer-mgr.c (modified) (4 diffs)
• peer-mgr.h (modified) (1 diff)
• peer-msgs.c (modified) (2 diffs)
• resume.c (modified) (5 diffs)

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

@@ -1521 +1521 @@
 #endif
 
+/* better goes first */
+static int
+compareAtomsByUsefulness( const void * va, const void *vb )
+{
+    const struct peer_atom * a = * (const struct peer_atom**) va;
+    const struct peer_atom * b = * (const struct peer_atom**) vb;
+
+    assert( ( 0 < a->from ) && ( a->from < TR_PEER_FROM__MAX ) );
+    assert( ( 0 < b->from ) && ( b->from < TR_PEER_FROM__MAX ) );
+
+    if( a->piece_data_time != b->piece_data_time )
+        return a->piece_data_time > b->piece_data_time ? -1 : 1;
+    if( a->from != b->from )
+        return a->from < b->from ? -1 : 1;
+    if( a->numFails != b->numFails )
+        return a->numFails < b->numFails ? -1 : 1;
+
+    return 0;
+}
+
 int
-tr_peerMgrGetPeers( tr_torrent * tor, tr_pex ** setme_pex, uint8_t af )
+tr_peerMgrGetPeers( tr_torrent * tor, tr_pex ** setme_pex, uint8_t af, int maxPeerCount )
 {
     int count = 0;
@@ -1531 +1551 @@
     {
         int i;
-        const struct peer_atom ** atoms = (const struct peer_atom**) tr_ptrArrayBase( &t->pool );
         const int atomCount = tr_ptrArraySize( &t->pool );
+        const int pexCount = MIN( atomCount, maxPeerCount );
+        const struct peer_atom ** atomsBase = (const struct peer_atom**) tr_ptrArrayBase( &t->pool );
+        struct peer_atom ** atoms = tr_memdup( atomsBase, atomCount * sizeof( struct peer_atom * ) );
         /* for now, this will waste memory on torrents that have both
          * ipv6 and ipv4 peers */
@@ -1538 +1560 @@
         tr_pex * walk = pex;
 
-        for( i=0; i<atomCount; ++i )
+        qsort( atoms, atomCount, sizeof( struct peer_atom * ), compareAtomsByUsefulness );
+
+        for( i=0; i<atomCount && count<pexCount; ++i )
         {
             const struct peer_atom * atom = atoms[i];
@@ -1553 +1577 @@
 
         assert( ( walk - pex ) == count );
-        qsort( pex, count, sizeof( tr_pex ), tr_pexCompare );
         *setme_pex = pex;
+
+        tr_free( atoms );
     }
 

branches/1.7x/libtransmission/peer-mgr.h

@@ -151 +151 @@
 int  tr_peerMgrGetPeers( tr_torrent      * tor,
                          tr_pex         ** setme_pex,
-                         uint8_t           af);
+                         uint8_t           af,
+                         int               maxPeerCount );
 
 void tr_peerMgrStartTorrent( tr_torrent * tor );

branches/1.7x/libtransmission/peer-msgs.c

@@ -70 +70 @@
     TR_LTEP_PEX             = 1,
 
-
+    MAX_PEX_PEER_COUNT      = 100,
 
     MIN_CHOKE_PERIOD_SEC    = ( 10 ),
@@ -1976 +1976 @@
         tr_pex * newPex = NULL;
         tr_pex * newPex6 = NULL;
-        const int newCount = tr_peerMgrGetPeers( msgs->torrent, &newPex, TR_AF_INET );
-        const int newCount6 = tr_peerMgrGetPeers( msgs->torrent, &newPex6, TR_AF_INET6 );
+        const int newCount = tr_peerMgrGetPeers( msgs->torrent, &newPex, TR_AF_INET, MAX_PEX_PEER_COUNT );
+        const int newCount6 = tr_peerMgrGetPeers( msgs->torrent, &newPex6, TR_AF_INET6, MAX_PEX_PEER_COUNT );
 
         /* build the diffs */

branches/1.7x/libtransmission/resume.c

@@ -59 +59 @@
 #define KEY_PROGRESS_BITFIELD "bitfield"
 
+enum
+{
+    MAX_REMEMBERED_PEERS = 200
+};
+
 static char*
 getResumeFilename( const tr_torrent * tor )
@@ -74 +79 @@
 
 static void
-savePeers( tr_benc *          dict,
-           const tr_torrent * tor )
+savePeers( tr_benc * dict, const tr_torrent * tor )
 {
     int count;
     tr_pex * pex;
 
-    count = tr_peerMgrGetPeers( (tr_torrent*) tor, &pex, TR_AF_INET );
+    count = tr_peerMgrGetPeers( (tr_torrent*) tor, &pex, TR_AF_INET, MAX_REMEMBERED_PEERS );
     if( count > 0 )
         tr_bencDictAddRaw( dict, KEY_PEERS, pex, sizeof( tr_pex ) * count );
     tr_free( pex );
 
-    count = tr_peerMgrGetPeers( (tr_torrent*) tor, &pex, TR_AF_INET6 );
+    count = tr_peerMgrGetPeers( (tr_torrent*) tor, &pex, TR_AF_INET6, MAX_REMEMBERED_PEERS );
     if( count > 0 )
         tr_bencDictAddRaw( dict, KEY_PEERS6, pex, sizeof( tr_pex ) * count );
@@ -92 +96 @@
 }
 
-static uint64_t
-loadPeers( tr_benc *    dict,
-           tr_torrent * tor )
+static tr_bool
+tr_isPex( const tr_pex * pex )
+{
+    return tr_isAddress( &pex->addr )
+        && ( pex->flags & 3 ) == pex->flags;
+}
+
+static int
+addPeers( tr_torrent * tor, const uint8_t * buf, int buflen )
+{
+    int i;
+    int numAdded = 0;
+    const int count = buflen / sizeof( tr_pex );
+
+    for( i=0; i<count && numAdded<MAX_REMEMBERED_PEERS; ++i )
+    {
+        tr_pex pex;
+        memcpy( &pex, buf + ( i * sizeof( tr_pex ) ), sizeof( tr_pex ) );
+        if( tr_isPex( &pex ) )
+        {
+            tr_peerMgrAddPex( tor, TR_PEER_FROM_CACHE, &pex );
+            ++numAdded;
+        }
+    }
+
+    return numAdded;
+}
+
+
+static uint64_t
+loadPeers( tr_benc * dict, tr_torrent * tor )
 {
     uint64_t        ret = 0;
@@ -102 +134 @@
     if( tr_bencDictFindRaw( dict, KEY_PEERS, &str, &len ) )
     {
-        int       i;
-        const int count = len / sizeof( tr_pex );
-        for( i = 0; i < count; ++i )
-        {
-            tr_pex pex;
-            memcpy( &pex, str + ( i * sizeof( tr_pex ) ), sizeof( tr_pex ) );
-            tr_peerMgrAddPex( tor, TR_PEER_FROM_CACHE, &pex );
-        }
-        tr_tordbg( tor, "Loaded %d IPv4 peers from resume file", count );
+        const int numAdded = addPeers( tor, str, len );
+        tr_tordbg( tor, "Loaded %d IPv4 peers from resume file", numAdded );
         ret = TR_FR_PEERS;
     }
@@ -116 +141 @@
     if( tr_bencDictFindRaw( dict, KEY_PEERS6, &str, &len ) )
     {
-        int       i;
-        const int count = len / sizeof( tr_pex );
-        for( i = 0; i < count; ++i )
-        {
-            tr_pex pex;
-            memcpy( &pex, str + ( i * sizeof( tr_pex ) ), sizeof( tr_pex ) );
-            tr_peerMgrAddPex( tor, TR_PEER_FROM_CACHE, &pex );
-        }
-        tr_tordbg( tor, "Loaded %d IPv6 peers from resume file", count );
+        const int numAdded = addPeers( tor, str, len );
+        tr_tordbg( tor, "Loaded %d IPv6 peers from resume file", numAdded );
         ret = TR_FR_PEERS;
     }