Changeset 8413

Timestamp:

May 16, 2009, 1:43:21 AM (14 years ago)

Author:

charles

Message:

(trunk libT) experimental faster implementation of tr_torrentFiles(). for the time being, keep the old implementation too and add an assertion that the two come up with the same results.

File:

• trunk/libtransmission/torrent.c (modified) (3 diffs)

trunk/libtransmission/torrent.c

@@ -843 +843 @@
     int                     usableSeeds = 0;
     uint64_t                now;
-    double                  downloadedForRatio, seedRatio;
+    double                  downloadedForRatio, seedRatio=0;
     tr_bool                 checkSeedRatio;
 
@@ -983 +983 @@
 
 static uint64_t
-fileBytesCompleted( const tr_torrent * tor,
+oldFileBytesCompleted( const tr_torrent * tor,
                     tr_file_index_t    fileIndex )
 {
@@ -1031 +1031 @@
 
     return haveBytes;
+}
+
+static uint64_t
+fileBytesCompleted( const tr_torrent * tor, tr_file_index_t index )
+{
+    uint64_t total = 0;
+
+    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( tr_cpBlockIsCompleteFast( &tor->completion, firstBlock ) )
+            total = f->length;
+    }
+    else
+    {
+        uint32_t i;
+
+        /* the first block */
+        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, i ) )
+                    total += tor->blockSize;
+        }
+        else
+        {
+            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 */
+            for( i=firstBlock+1; i<lastBlock && i<=lastBlockOfFirstPiece; ++i )
+                if( tr_cpBlockIsCompleteFast( &tor->completion, i ) )
+                    total += tor->blockSize;
+
+            /* the middle pieces */
+            if( f->firstPiece + 1 < f->lastPiece ) {
+                uint64_t b = tor->blockCountInPiece * ( f->lastPiece - ( f->firstPiece + 1 ) );
+                for( i=f->firstPiece+1; i<f->lastPiece; ++i )
+                    b -= tr_cpMissingBlocksInPiece( &tor->completion, i );
+                b *= tor->blockSize;
+                total += b;
+            }
+
+            /* the rest of the last piece */
+            for( i=firstBlockOfLastPiece; i<lastBlock; ++i )
+                if( tr_cpBlockIsCompleteFast( &tor->completion, i ) )
+                    total += tor->blockSize;
+        }
+
+        /* the last block */
+        if( tr_cpBlockIsCompleteFast( &tor->completion, lastBlock ) )
+            total += ( lastByte+1 - (lastBlock*tor->blockSize) );
+    }
+
+    assert( total == oldFileBytesCompleted( tor, index ) );
+    return total;
 }