Changeset 12012 for trunk/libtransmission/cache.c

Timestamp:

Feb 23, 2011, 3:54:04 AM (11 years ago)

Author:

jordan

Message:

(trunk libT) #4048 "use bitsets instead of bitfield in tr_completion" -- done.

Excuse the sprawl. Much of this didn't fit into self-contained commits.

File:

• trunk/libtransmission/cache.c (modified) (4 diffs)

trunk/libtransmission/cache.c

@@ -390 +390 @@
 
 static int
-findPiece( tr_cache * cache, tr_torrent * torrent, tr_piece_index_t piece )
+findBlockPos( tr_cache * cache, tr_torrent * torrent, tr_piece_index_t block )
 {
     struct cache_block key;
     key.tor = torrent;
-    key.block = tr_torPieceFirstBlock( torrent, piece );
+    key.block = block;
     return tr_ptrArrayLowerBound( &cache->blocks, &key, cache_block_compare, NULL );
 }
@@ -420 +420 @@
 tr_cacheFlushFile( tr_cache * cache, tr_torrent * torrent, tr_file_index_t i )
 {
-    int err = 0;
-    const tr_file * file = &torrent->info.files[i];
-    const tr_block_index_t begin = tr_torPieceFirstBlock( torrent, file->firstPiece );
-    const tr_block_index_t end  = tr_torPieceFirstBlock( torrent, file->lastPiece ) + tr_torPieceCountBlocks( torrent, file->lastPiece );
-    const int pos = findPiece( cache, torrent, file->firstPiece );
-    dbgmsg( "flushing file %d from cache to disk: blocks [%zu...%zu)", (int)i, (size_t)begin, (size_t)end );
+    int pos;
+    int err = 0;
+    tr_block_index_t first;
+    tr_block_index_t last;
+    tr_torGetFileBlockRange( torrent, i, &first, &last );
+    pos = findBlockPos( cache, torrent, first );
+    dbgmsg( "flushing file %d from cache to disk: blocks [%zu...%zu]", (int)i, (size_t)first, (size_t)last );
 
     /* flush out all the blocks in that file */
@@ -432 +433 @@
         const struct cache_block * b = tr_ptrArrayNth( &cache->blocks, pos );
         if( b->tor != torrent ) break;
-        if( ( b->block < begin ) || ( b->block >= end ) ) break;
+        if( ( b->block < first ) || ( b->block > last ) ) break;
         err = flushContiguous( cache, pos, getBlockRun( cache, pos, NULL ) );
     }
@@ -443 +444 @@
 {
     int err = 0;
-    const int pos = findPiece( cache, torrent, 0 );
+    const int pos = findBlockPos( cache, torrent, 0 );
 
     /* flush out all the blocks in that torrent */