Changeset 3058

Timestamp:

Sep 13, 2007, 4:50:23 PM (15 years ago)

Author:

charles

Message:

remove some pieces that are now unused.

Location:

branches/encryption/libtransmission

Files:

• completion.c (modified) (6 diffs)
• completion.h (modified) (1 diff)

branches/encryption/libtransmission/completion.c

@@ -34 +34 @@
     tr_torrent * tor;
 
-    /* true if a peer is requesting this block */
-    tr_bitfield * blockRequested;
-
     /* do we have this block? */
     tr_bitfield * blockBitfield;
@@ -59 +56 @@
     cp->tor              = tor;
     cp->blockBitfield    = tr_bitfieldNew( tor->blockCount );
-    cp->blockRequested   = tr_bitfieldNew( tor->blockCount );
     cp->pieceBitfield    = tr_bitfieldNew( tor->info.pieceCount );
     cp->completeBlocks   = tr_new( uint16_t, tor->info.pieceCount );
@@ -72 +68 @@
     tr_free(         cp->completeBlocks );
     tr_bitfieldFree( cp->pieceBitfield );
-    tr_bitfieldFree( cp->blockRequested );
     tr_bitfieldFree( cp->blockBitfield );
     tr_free(         cp );
@@ -83 +78 @@
     tr_bitfieldClear( cp->pieceBitfield );
     tr_bitfieldClear( cp->blockBitfield );
-    tr_bitfieldClear( cp->blockRequested );
     memset( cp->completeBlocks, 0, sizeof(uint16_t) * tor->info.pieceCount );
 
@@ -191 +185 @@
 }
 
-/* Blocks */
-void tr_cpDownloaderAdd( tr_completion * cp, int block )
-{
-    tr_bitfieldAdd( cp->blockRequested, block );
-}
-
-void tr_cpDownloaderRem( tr_completion * cp, int block )
-{
-    tr_bitfieldRem( cp->blockRequested, block );
-}
-
 int tr_cpBlockIsComplete( const tr_completion * cp, int block )
 {
@@ -260 +243 @@
 }
 
-int
-tr_cpMissingBlocksForPiece( const tr_completion * cp, int piece )
-{
-    int i;
-    int n;
-    const tr_torrent * tor = cp->tor;
-    const int start = tr_torPieceFirstBlock(tor,piece);
-    const int end   = start + tr_torPieceCountBlocks(tor,piece);
-
-    n = 0;
-    for( i = start; i < end; ++i )
-        if( !tr_cpBlockIsComplete( cp, i ) && !tr_bitfieldHas( cp->blockRequested, i ) )
-            ++n;
-
-    return n;
-}
-
-int tr_cpMissingBlockInPiece( const tr_completion * cp, int piece )
-{
-    int i;
-    const tr_torrent * tor = cp->tor;
-    const int start = tr_torPieceFirstBlock(tor,piece);
-    const int end   = start + tr_torPieceCountBlocks(tor,piece);
-
-    for( i = start; i < end; ++i )
-        if( !tr_cpBlockIsComplete( cp, i ) && !tr_bitfieldHas( cp->blockRequested, i ) )
-            return i;
-
-    return -1;
-}
-
 /***
 ****

branches/encryption/libtransmission/completion.h

@@ -50 +50 @@
 
 /* Blocks */
-void             tr_cpDownloaderAdd( tr_completion *, int block );
-void             tr_cpDownloaderRem( tr_completion *, int block );
 int              tr_cpBlockIsComplete( const tr_completion *, int block );
 void             tr_cpBlockAdd( tr_completion *, int block );
 void             tr_cpBlockBitfieldSet( tr_completion *, struct tr_bitfield * );
 float            tr_cpPercentBlocksInPiece( const tr_completion * cp, int piece );
-/* Missing = we don't have it and we are not getting it from any peer yet */
-int              tr_cpMissingBlocksForPiece( const tr_completion * cp, int piece );
-int              tr_cpMissingBlockInPiece( const tr_completion *, int piece );
 
 const struct tr_bitfield * tr_cpPieceBitfield( const tr_completion* );