Changeset 9782

Timestamp:

Dec 15, 2009, 8:13:34 PM (12 years ago)

Author:

charles

Message:

(trunk libT) #2548 "T's request queue can send out too many duplicate requests" -- experimental revision to r9465 to address further overdownloading issues

File:

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

trunk/libtransmission/peer-mgr.c

@@ -567 +567 @@
     const struct block_request * a = va;
     const struct block_request * b = vb;
+
+    /* primary key: block */
     if( a->block < b->block ) return -1;
     if( a->block > b->block ) return 1;
+
+    /* secondary key: peer */
+    if( a->peer < b->peer ) return -1;
+    if( a->peer > b->peer ) return 1;
+
     return 0;
 }
@@ -577 +584 @@
     const struct block_request * a = va;
     const struct block_request * b = vb;
+
+    /* primary key: time */
     if( a->sentAt < b->sentAt ) return -1;
     if( a->sentAt > b->sentAt ) return 1;
+
+    /* secondary key: peer */
+    if( a->peer < b->peer ) return -1;
+    if( a->peer > b->peer ) return 1;
+
     return 0;
 }
@@ -647 +661 @@
 
 static struct block_request *
-requestListLookup( Torrent * t, tr_block_index_t block )
+requestListLookup( Torrent * t, tr_block_index_t block, const tr_peer * peer )
 {
     struct block_request key;
     key.block = block;
+    key.peer = (tr_peer*) peer;
 
     requestListSort( t, REQ_SORTED_BY_BLOCK );
@@ -659 +674 @@
 }
 
-static void
-requestListRemove( Torrent * t, tr_block_index_t block )
-{
-    const struct block_request * b = requestListLookup( t, block );
+static int
+countBlockRequests( Torrent * t, tr_block_index_t block )
+{
+    tr_bool exact;
+    int i, n, pos;
+    struct block_request key;
+
+    requestListSort( t, REQ_SORTED_BY_BLOCK );
+    key.block = block;
+    key.peer = NULL;
+    pos = tr_lowerBound( &key, t->requests, t->requestCount,
+                         sizeof( struct block_request ),
+                         compareReqByBlock, &exact );
+
+    assert( !exact ); /* shouldn't have a request with .peer == NULL */
+
+    n = 0;
+    for( i=pos; i<t->requestCount; ++i ) {
+        if( t->requests[i].block == block )
+            ++n;
+        else
+            break;
+    }
+
+    return n;
+}
+
+static void
+requestListRemove( Torrent * t, tr_block_index_t block, const tr_peer * peer )
+{
+    const struct block_request * b = requestListLookup( t, block, peer );
     if( b != NULL )
     {
@@ -921 +963 @@
     {
         struct weighted_piece * p = pieces + i;
+        const int missing = tr_cpMissingBlocksInPiece( &tor->completion, p->index );
+        const int maxDuplicatesPerBlock = t->isInEndgame ? 3 : 1;
+
+        if( p->requestCount > ( missing * maxDuplicatesPerBlock ) )
+            continue;
 
         /* if the peer has this piece that we want... */
@@ -930 +977 @@
             for( ; b!=e && got<numwant; ++b )
             {
-                struct block_request * breq;
-
                 /* don't request blocks we've already got */
                 if( tr_cpBlockIsCompleteFast( &tor->completion, b ) )
                     continue;
 
-                /* don't request blocks we've already requested (FIXME) */
-                breq = requestListLookup( t, b );
-                if( breq != NULL ) {
-                    assert( breq->peer != NULL );
-                    if( breq->peer == peer ) continue;
-                    if( !t->isInEndgame ) continue;
-                }
-
+                /* don't send the same request to the same peer twice */
+                if( tr_peerMgrDidPeerRequest( tor, peer, b ) )
+                    continue;
+
+                /* don't send the same request to any peer too many times */
+                if( countBlockRequests( t, b ) > maxDuplicatesPerBlock )
+                    continue;
+
+                /* update the caller's table */
                 setme[got++] = b;
 
                 /* update our own tables */
-                if( breq == NULL )
-                    requestListAdd( t, now, b, peer );
+                requestListAdd( t, now, b, peer );
                 ++p->requestCount;
             }
@@ -955 +1000 @@
 
     /* In most cases we've just changed the weights of a small number of pieces.
-     * So rather than qsort()ing the entire array, it's faster to sort just the
+     * So rather than qsort()ing the entire array, it's faster to sort only the
      * changed ones, then do a standard merge-two-sorted-arrays pass on the
      * changed and unchanged pieces. */
@@ -1002 +1047 @@
 {
     const Torrent * t = tor->torrentPeers;
-    const struct block_request * b = requestListLookup( (Torrent*)t, block );
-    if( b == NULL ) return FALSE;
-    if( b->peer == peer ) return TRUE;
-    if( t->isInEndgame ) return TRUE;
-    return FALSE;
+    return requestListLookup( (Torrent*)t, block, peer ) != NULL;
 }
 
@@ -1152 +1193 @@
 
 static void
-removeRequestFromTables( Torrent * t, tr_block_index_t block )
-{
-    requestListRemove( t, block );
+removeRequestFromTables( Torrent * t, tr_block_index_t block, const tr_peer * peer )
+{
+    requestListRemove( t, block, peer );
     pieceListRemoveRequest( t, block );
 }
@@ -1171 +1212 @@
 
     for( i=0; i<n; ++i )
-        removeRequestFromTables( t, blocks[i] );
+        removeRequestFromTables( t, blocks[i], peer );
 
     tr_free( blocks );
@@ -1226 +1267 @@
 
         case TR_PEER_CLIENT_GOT_REJ:
-            removeRequestFromTables( t, _tr_block( t->tor, e->pieceIndex, e->offset ) );
+            removeRequestFromTables( t, _tr_block( t->tor, e->pieceIndex, e->offset ), peer );
             break;
 
@@ -1296 +1337 @@
             tr_block_index_t block = _tr_block( tor, e->pieceIndex, e->offset );
 
-            requestListRemove( t, block );
+            requestListRemove( t, block, peer );
             pieceListRemoveRequest( t, block );