mirror/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission synced 2025-03-06 11:38:21 +00:00
Code Issues Releases Wiki Activity

(trunk libT) smoke out any errors in the tr_torrentFiles() rewrite

Browse source
This commit is contained in:
Charles Kerr 2009-05-21 18:37:55 +00:00
parent b77874936e
commit b1f675eb83
1 changed files with 68 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

111
libtransmission/torrent.c
View file

@ -666,6 +666,14 @@ torrentRealInit( tr_torrent * tor, const tr_ctor * ctor )
tr_metainfoMigrate( session, &tor->info ); tr_metainfoMigrate( session, &tor->info );
{
/* exercise the new tr_torrentFiles() code in the nightly builds...
maybe this will make rolcol stay in-channel */
tr_file_index_t tmpCount;
tr_file_stat * tmp = tr_torrentFiles( tor, &tmpCount );
tr_torrentFilesFree( tmp, tmpCount );
}
if( doStart ) if( doStart )
torrentStart( tor, FALSE ); torrentStart( tor, FALSE );
} }
@ -1036,63 +1044,80 @@ static uint64_t
fileBytesCompleted( const tr_torrent * tor, tr_file_index_t index ) fileBytesCompleted( const tr_torrent * tor, tr_file_index_t index )
{ {
uint64_t total = 0; uint64_t total = 0;
const tr_file * f = &tor->info.files[index]; const tr_file * f = &tor->info.files[index];
const tr_block_index_t firstBlock = f->offset / tor->blockSize;
const uint64_t lastByte = f->offset + f->length - (f->length?1:0);
const tr_block_index_t lastBlock = lastByte / tor->blockSize;
if( firstBlock == lastBlock ) if( f->length )
{ {
if( tr_cpBlockIsCompleteFast( &tor->completion, firstBlock ) ) const tr_block_index_t firstBlock = f->offset / tor->blockSize;
total = f->length; const uint64_t lastByte = f->offset + f->length - 1;
} const tr_block_index_t lastBlock = lastByte / tor->blockSize;
else
{
uint32_t i;
/* the first block */ if( firstBlock == lastBlock )
if( tr_cpBlockIsCompleteFast( &tor->completion, firstBlock ) )
total += tor->blockSize - ( f->offset % tor->blockSize );
/* the middle blocks */
if( f->firstPiece == f->lastPiece )
{ {
for( i=firstBlock+1; i<lastBlock; ++i ) if( tr_cpBlockIsCompleteFast( &tor->completion, firstBlock ) )
if( tr_cpBlockIsCompleteFast( &tor->completion, i ) ) total = f->length;
total += tor->blockSize;
} }
else else
{ {
int64_t b = 0; uint32_t i;
const tr_block_index_t firstBlockOfLastPiece
= tr_torPieceFirstBlock( tor, f->lastPiece );
const tr_block_index_t lastBlockOfFirstPiece
= tr_torPieceFirstBlock( tor, f->firstPiece )
+ tr_torPieceCountBlocks( tor, f->firstPiece ) - 1;
/* the rest of the first piece */ /* the first block */
for( i=firstBlock+1; i<lastBlock && i<=lastBlockOfFirstPiece; ++i ) if( tr_cpBlockIsCompleteFast( &tor->completion, firstBlock ) )
if( tr_cpBlockIsCompleteFast( &tor->completion, i ) ) total += tor->blockSize - ( f->offset % tor->blockSize );
++b;
/* the middle pieces */ /* the middle blocks */
if( f->firstPiece + 1 < f->lastPiece ) if( f->firstPiece == f->lastPiece )
for( i=f->firstPiece+1; i<f->lastPiece; ++i ) {
b += tor->blockCountInPiece - tr_cpMissingBlocksInPiece( &tor->completion, i ); for( i=firstBlock+1; i<lastBlock; ++i )
if( tr_cpBlockIsCompleteFast( &tor->completion, i ) )
total += tor->blockSize;
}
else
{
int64_t b = 0;
const tr_block_index_t firstBlockOfLastPiece
= tr_torPieceFirstBlock( tor, f->lastPiece );
const tr_block_index_t lastBlockOfFirstPiece
= tr_torPieceFirstBlock( tor, f->firstPiece )
+ tr_torPieceCountBlocks( tor, f->firstPiece ) - 1;
/* the rest of the last piece */ /* the rest of the first piece */
for( i=firstBlockOfLastPiece; i<lastBlock; ++i ) for( i=firstBlock+1; i<lastBlock && i<=lastBlockOfFirstPiece; ++i )
if( tr_cpBlockIsCompleteFast( &tor->completion, i ) ) if( tr_cpBlockIsCompleteFast( &tor->completion, i ) )
++b; ++b;
b *= tor->blockSize; /* the middle pieces */
total += b; if( f->firstPiece + 1 < f->lastPiece )
for( i=f->firstPiece+1; i<f->lastPiece; ++i )
b += tor->blockCountInPiece - tr_cpMissingBlocksInPiece( &tor->completion, i );
/* the rest of the last piece */
for( i=firstBlockOfLastPiece; i<lastBlock; ++i )
if( tr_cpBlockIsCompleteFast( &tor->completion, i ) )
++b;
b *= tor->blockSize;
total += b;
}
/* the last block */
if( tr_cpBlockIsCompleteFast( &tor->completion, lastBlock ) )
total += ( f->offset + f->length ) - ( tor->blockSize * lastBlock );
} }
}
/* the last block */ if ( total != oldFileBytesCompleted( tor, index ) )
if( tr_cpBlockIsCompleteFast( &tor->completion, lastBlock ) ) {
total += ( lastByte+1 - (lastBlock*tor->blockSize) ); fprintf( stderr, "torrent is [%s], file #%d\n", tor->info.name, (int)index );
fprintf( stderr, "total size is %"PRIu64"\n", (uint64_t)tor->info.totalSize );
fprintf( stderr, "block size is %"PRIu64"\n", (uint64_t)tor->blockSize );
fprintf( stderr, "piece size is %"PRIu64"\n", (uint64_t)tor->info.pieceSize );
fprintf( stderr, "file offset is %"PRIu64"\n", (uint64_t)f->offset );
fprintf( stderr, "file size is %"PRIu64"\n", (uint64_t)f->length );
fprintf( stderr, " old size is %"PRIu64"\n", (uint64_t)oldFileBytesCompleted( tor, index ) );
fprintf( stderr, "first piece is %"PRIu64"\n", (uint64_t)f->firstPiece );
fprintf( stderr, "last piece is %"PRIu64"\n", (uint64_t)f->lastPiece );
fprintf( stderr, " new size is %"PRIu64"\n", (uint64_t)total );
} }
assert( total == oldFileBytesCompleted( tor, index ) ); assert( total == oldFileBytesCompleted( tor, index ) );