Changeset 5001

Timestamp:

Feb 10, 2008, 4:03:19 AM (15 years ago)

Author:

charles

Message:

#698: have' gets too far ahead of verified'

Location:

trunk/libtransmission

Files:

• completion.c (modified) (1 diff)
• completion.h (modified) (1 diff)
• peer-mgr.c (modified) (7 diffs)
• peer-msgs.c (modified) (4 diffs)

trunk/libtransmission/completion.c

@@ -260 +260 @@
 }
 
+int
+tr_cpMissingBlocksInPiece( const tr_completion * cp, int piece )
+{
+    assert( cp != NULL );
+
+    return tr_torPieceCountBlocks(cp->tor,piece) - cp->completeBlocks[piece];
+}
+
 /***
 ****

trunk/libtransmission/completion.h

@@ -55 +55 @@
 void             tr_cpBlockBitfieldSet( tr_completion *, struct tr_bitfield * );
 float            tr_cpPercentBlocksInPiece( const tr_completion * cp, int piece );
+int              tr_cpMissingBlocksInPiece( const tr_completion * cp, int piece );
+
 
 const struct tr_bitfield * tr_cpPieceBitfield( const tr_completion* );

trunk/libtransmission/peer-mgr.c

@@ -548 +548 @@
 }
 
+static int
+clientIsDownloadingFrom( const tr_peer * peer )
+{
+    return peer->clientIsInterested && !peer->clientIsChoked;
+}
+
+static int
+clientIsUploadingTo( const tr_peer * peer )
+{
+    return peer->peerIsInterested && !peer->peerIsChoked;
+}
+
 /***
 ****  Refill
@@ -555 +567 @@
 {
     tr_priority_t priority;
-    int percentDone;
+    int missingBlockCount;
     uint16_t random;
     uint32_t piece;
@@ -568 +580 @@
     const struct tr_refill_piece * a = aIn;
     const struct tr_refill_piece * b = bIn;
+
+    /* fewer missing pieces goes first */
+    if( a->missingBlockCount != b->missingBlockCount )
+        return a->missingBlockCount < b->missingBlockCount ? -1 : 1;
     
     /* if one piece has a higher priority, it goes first */
     if( a->priority != b->priority )
         return a->priority > b->priority ? -1 : 1;
-
-    /* try to fill partial pieces */
-    if( a->percentDone != b->percentDone )
-        return a->percentDone > b->percentDone ? -1 : 1;
     
     /* if one *might be* fastallowed to us, get it first...
@@ -646 +658 @@
             setme->fastAllowed = 0;
             setme->random = tr_rand( UINT16_MAX );
-            setme->percentDone = (int)( 100.0 * tr_cpPercentBlocksInPiece( tor->completion, piece ) );
+            setme->missingBlockCount = tr_cpMissingBlocksInPiece( tor->completion, piece );
 
             for( k=0; k<peerCount; ++k ) {
@@ -762 +774 @@
 }
 
+static tr_peer**
+getPeersUploadingToClient( Torrent * t, int * setmeCount )
+{
+    int i;
+    int peerCount = 0;
+    int retCount = 0;
+    tr_peer ** peers = (tr_peer **) tr_ptrArrayPeek( t->peers, &peerCount );
+    tr_peer ** ret = tr_new( tr_peer*, peerCount );
+
+    /* get a list of peers we're downloading from */
+    for( i=0; i<peerCount; ++i )
+        if( clientIsDownloadingFrom( peers[i] ) )
+            ret[retCount++] = peers[i];
+
+    /* pick a different starting point each time so all peers
+     * get a chance at the first blocks in the queue */
+    if( retCount ) {
+        tr_peer ** tmp = tr_new( tr_peer*, retCount );
+        i = tr_rand( retCount );
+        memcpy( tmp, ret, sizeof(tr_peer*) * retCount );
+        memcpy( ret, tmp+i, sizeof(tr_peer*) * (retCount-i) );
+        memcpy( ret+(retCount-i), tmp, sizeof(tr_peer*) * i );
+        tr_free( tmp );
+    }
+
+    *setmeCount = retCount;
+    return ret;
+}
+
 static int
 refillPulse( void * vtorrent )
@@ -782 +823 @@
 
     blocks = getPreferredBlocks( t, &blockCount );
-    peers = getConnectedPeers( t, &peerCount );
+    peers = getPeersUploadingToClient( t, &peerCount );
 
     for( i=0; peerCount && i<blockCount; ++i )
     {
+        int j;
+
         const uint64_t block = blocks[i];
         const uint32_t index = tr_torBlockPiece( tor, block );
         const uint32_t begin = (block * tor->blockSize) - (index * tor->info.pieceSize);
         const uint32_t length = tr_torBlockCountBytes( tor, (int)block );
-        int j;
+
         assert( _tr_block( tor, index, begin ) == (int)block );
         assert( begin < (uint32_t)tr_torPieceCountBytes( tor, (int)index ) );
@@ -1406 +1449 @@
     managerUnlock( (tr_peerMgr*)manager );
     return ret;
-}
-
-static int
-clientIsDownloadingFrom( const tr_peer * peer )
-{
-    return peer->clientIsInterested && !peer->clientIsChoked;
-}
-
-static int
-clientIsUploadingTo( const tr_peer * peer )
-{
-    return peer->peerIsInterested && !peer->peerIsChoked;
 }
 

trunk/libtransmission/peer-msgs.c

@@ -77 +77 @@
     MAX_FAST_ALLOWED_THRESHOLD = 10,        /* max threshold for allowing fast-pieces requests */
 
-    REQUEST_TTL_SECS = 120
+    QUEUED_REQUEST_TTL_SECS = 20,
+
+    SENT_REQUEST_TTL_SECS = 90
 
 };
@@ -590 +592 @@
     for( l=msgs->clientWillAskFor; l!=NULL; l=l->next ) {
         struct peer_request * req = l->data;
-        if( req->time_requested + REQUEST_TTL_SECS < now )
+        if( req->time_requested + QUEUED_REQUEST_TTL_SECS < now )
             tr_list_prepend( &prune, req );
     }
@@ -598 +600 @@
     for( l=msgs->clientAskedFor; l!=NULL; l=l->next ) {
         struct peer_request * req = l->data;
-        if( req->time_requested + REQUEST_TTL_SECS < now )
+        if( req->time_requested + SENT_REQUEST_TTL_SECS < now )
             tr_list_prepend( &prune, req );
     }
@@ -1551 +1553 @@
     msgs->info->rateToClient = tr_rcRate( msgs->info->rcToClient );
     msgs->info->rateToPeer = tr_rcRate( msgs->info->rcToPeer );
-    msgs->maxActiveRequests = MIN( 8 + (int)(msgs->info->rateToClient/5), 100 );
+    msgs->maxActiveRequests = MIN( 4 + (int)(msgs->info->rateToClient/4), 100 );
     msgs->minActiveRequests = msgs->maxActiveRequests / 3;
     return TRUE;