Changeset 7027

Timestamp:

Nov 3, 2008, 5:01:08 PM (12 years ago)

Author:

charles

Message:

(libT) micro-optimizations suggested by cachegrind

Location:

trunk/libtransmission

Files:

• completion.c (modified) (1 diff)
• torrent.c (modified) (1 diff)

trunk/libtransmission/completion.c

@@ -304 +304 @@
 tr_cpHaveValid( const tr_completion * cp )
 {
-    uint64_t           b = 0;
-    tr_piece_index_t   i;
-    const tr_torrent * tor = cp->tor;
-
-    for( i = 0; i < tor->info.pieceCount; ++i )
+    uint64_t                  b = 0;
+    tr_piece_index_t          i;
+    const tr_torrent        * tor            = cp->tor;
+    const uint64_t            pieceSize      = tor->info.pieceSize;
+    const uint64_t            lastPieceSize  = tor->lastPieceSize;
+    const tr_piece_index_t    lastPiece      = tor->info.pieceCount - 1;
+
+    for( i=0; i!=lastPiece; ++i )
         if( tr_cpPieceIsComplete( cp, i ) )
-            b += tr_torPieceCountBytes( tor, i );
+            b += pieceSize;
+
+    if( tr_cpPieceIsComplete( cp, lastPiece ) )
+        b += lastPieceSize;
 
     return b;

trunk/libtransmission/torrent.c

@@ -100 +100 @@
 
     while( ( tor = tr_torrentNext( handle, tor ) ) )
-        if( !memcmp( tor->info.hash, torrentHash, SHA_DIGEST_LENGTH ) )
-            return tor;
+        if( *tor->info.hash == *torrentHash )
+            if( !memcmp( tor->info.hash, torrentHash, SHA_DIGEST_LENGTH ) )
+                return tor;
 
     return NULL;