Changeset 7050

Timestamp:

Nov 5, 2008, 4:50:03 AM (12 years ago)

Author:

charles

Message:

(libT) optimize tr_cpHaveValid(), which according to cachegrind is the biggest remaining hotspot function

File:

• trunk/libtransmission/completion.c (modified) (10 diffs)

trunk/libtransmission/completion.c

@@ -34 +34 @@
 {
     unsigned int    sizeWhenDoneIsDirty : 1;
+    unsigned int    haveValidIsDirty : 1;
 
     tr_torrent *    tor;
@@ -50 +51 @@
        use tr_cpSizeWhenDone() instead! */
     uint64_t    sizeWhenDoneLazy;
+
+    /* number of bytes we'll have when done downloading. [0..info.totalSize]
+       DON'T access this directly; it's a lazy field.
+       use tr_cpHaveValid() instead! */
+    uint64_t    haveValidLazy;
 
     /* number of bytes we want or have now. [0..sizeWhenDone] */
@@ -64 +70 @@
     cp->sizeNow = 0;
     cp->sizeWhenDoneIsDirty = 1;
+    cp->haveValidIsDirty = 1;
 }
 
@@ -143 +150 @@
                       tr_piece_index_t      piece )
 {
-    return cp->completeBlocks[piece] == tr_torPieceCountBlocks( cp->tor,
-                                                                piece );
+    return cp->completeBlocks[piece] == tr_torPieceCountBlocks( cp->tor, piece );
 }
 
@@ -186 +192 @@
 
     cp->sizeWhenDoneIsDirty = 1;
+    cp->haveValidIsDirty = 1;
     cp->completeBlocks[piece] = 0;
     tr_bitfieldRemRange ( cp->blockBitfield, start, end );
@@ -212 +219 @@
         ++cp->completeBlocks[piece];
 
-        if( cp->completeBlocks[piece] == tr_torPieceCountBlocks( tor, piece ) )
+        if( tr_cpPieceIsComplete( cp, piece ) )
             tr_bitfieldAdd( cp->pieceBitfield, piece );
 
@@ -219 +226 @@
         cp->sizeNow += blockSize;
 
+        cp->haveValidIsDirty = 1;
         cp->sizeWhenDoneIsDirty = 1;
     }
@@ -261 +269 @@
                            tr_piece_index_t      piece )
 {
-    return tr_torPieceCountBlocks( cp->tor,
-                                   piece ) - cp->completeBlocks[piece];
+    return tr_torPieceCountBlocks( cp->tor, piece ) - cp->completeBlocks[piece];
 }
 
@@ -301 +308 @@
 }
 
-uint64_t
-tr_cpHaveValid( const tr_completion * cp )
+static uint64_t
+calculateHaveValid( const tr_completion * ccp )
 {
     uint64_t                  b = 0;
     tr_piece_index_t          i;
-    const tr_torrent        * tor            = cp->tor;
+    const tr_torrent        * tor            = ccp->tor;
     const uint64_t            pieceSize      = tor->info.pieceSize;
     const uint64_t            lastPieceSize  = tor->lastPieceSize;
@@ -312 +319 @@
 
     for( i=0; i!=lastPiece; ++i )
-        if( tr_cpPieceIsComplete( cp, i ) )
+        if( tr_cpPieceIsComplete( ccp, i ) )
             b += pieceSize;
 
-    if( tr_cpPieceIsComplete( cp, lastPiece ) )
+    if( tr_cpPieceIsComplete( ccp, lastPiece ) )
         b += lastPieceSize;
 
     return b;
+}
+
+uint64_t
+tr_cpHaveValid( const tr_completion * ccp )
+{
+    if( ccp->haveValidIsDirty )
+    {
+        tr_completion * cp = (tr_completion *) ccp; /* mutable */
+        cp->haveValidLazy = calculateHaveValid( ccp );
+        cp->haveValidIsDirty = 0;
+    }
+
+    return ccp->haveValidLazy;
 }