Changeset 10332 for trunk/libtransmission/peer-msgs.c

Timestamp:

Mar 8, 2010, 4:29:58 AM (12 years ago)

Author:

charles

Message:

(trunk) #2993 "'Downloaded' much greater than 'Have' or 'verified'" -- add new congestion-based throttle for 2.0

File:

• trunk/libtransmission/peer-msgs.c (modified) (6 diffs)

trunk/libtransmission/peer-msgs.c

@@ -675 +675 @@
 **/
 
-static tr_bool
-isPieceInteresting( const tr_peermsgs * msgs,
-                    tr_piece_index_t    piece )
-{
-    const tr_torrent * torrent = msgs->torrent;
-
-    return ( !torrent->info.pieces[piece].dnd )                  /* we want it */
-          && ( !tr_cpPieceIsComplete( &torrent->completion, piece ) ) /* !have */
-          && ( tr_bitsetHas( &msgs->peer->have, piece ) );      /* peer has it */
-}
-
-/* "interested" means we'll ask for piece data if they unchoke us */
-static tr_bool
-isPeerInteresting( const tr_peermsgs * msgs )
-{
-    tr_piece_index_t    i;
-    const tr_torrent *  torrent;
-    const tr_bitfield * bitfield;
-    const int           clientIsSeed = tr_torrentIsSeed( msgs->torrent );
-
-    if( clientIsSeed )
-        return FALSE;
-
-    if( !tr_torrentIsPieceTransferAllowed( msgs->torrent, TR_PEER_TO_CLIENT ) )
-        return FALSE;
-
-    torrent = msgs->torrent;
-    bitfield = tr_cpPieceBitfield( &torrent->completion );
-
-    for( i = 0; i < torrent->info.pieceCount; ++i )
-        if( isPieceInteresting( msgs, i ) )
-            return TRUE;
-
-    return FALSE;
-}
-
 static void
 sendInterest( tr_peermsgs * msgs, tr_bool clientIsInterested )
@@ -729 +693 @@
 
 static void
-updateInterest( tr_peermsgs * msgs )
-{
-    const int i = isPeerInteresting( msgs );
-
-    if( i != msgs->peer->clientIsInterested )
-        sendInterest( msgs, i );
+updateInterest( tr_peermsgs * msgs UNUSED )
+{
+    /* FIXME -- might need to poke the mgr on startup */
+}
+
+void
+tr_peerMsgsSetInterested( tr_peermsgs * msgs, int isInterested )
+{
+    assert( tr_isBool( isInterested ) );
+
+    if( isInterested != msgs->peer->clientIsInterested )
+        sendInterest( msgs, isInterested );
 }
 
@@ -838 +808 @@
 {
     struct peer_request req;
+/*fprintf( stderr, "SENDING CANCEL MESSAGE FOR BLOCK %zu\n\t\tFROM PEER %p ------------------------------------\n", (size_t)block, msgs->peer );*/
     blockToReq( msgs->torrent, block, &req );
     protocolSendCancel( msgs, &req );
@@ -1469 +1440 @@
             int i;
             struct peer_request r;
+            const uint64_t now_msec = tr_date( );
             tr_peerIoReadUint32( msgs->peer->io, inbuf, &r.index );
             tr_peerIoReadUint32( msgs->peer->io, inbuf, &r.offset );
             tr_peerIoReadUint32( msgs->peer->io, inbuf, &r.length );
+            tr_historyAdd( msgs->torrent->blocksSentToClient, now_msec, 1 );
+            tr_historyAdd( msgs->peer->cancelsSentToClient, now_msec, 1 );
             dbgmsg( msgs, "got a Cancel %u:%u->%u", r.index, r.offset, r.length );
 
@@ -1953 +1927 @@
             else
             {
+                const uint64_t now_msec = tr_date( );
                 dbgmsg( msgs, "sending block %u:%u->%u", req.index, req.offset, req.length );
                 EVBUFFER_LENGTH(out) += req.length;
@@ -1959 +1934 @@
                 bytesWritten += EVBUFFER_LENGTH( out );
                 msgs->clientSentAnythingAt = now;
+                tr_historyAdd( msgs->torrent->blocksSentToClient, now_msec, 1 );
+                tr_historyAdd( msgs->peer->blocksSentToPeer, now_msec, 1 );
             }