Changeset 7559

Timestamp:

Dec 31, 2008, 6:08:13 PM (12 years ago)

Author:

charles

Message:

(trunk libT) improve piece verification speed by providing a larger buffer, and add a mechanism to reuse it when verifying an entire torrent at once.

Location:

trunk/libtransmission

Files:

• inout.c (modified) (3 diffs)
• inout.h (modified) (1 diff)
• peer-mgr.c (modified) (1 diff)
• verify.c (modified) (4 diffs)

trunk/libtransmission/inout.c

@@ -211 +211 @@
 ****/
 
-static int
+static tr_bool
 recalculateHash( const tr_torrent * tor,
                  tr_piece_index_t   pieceIndex,
+                 void             * buffer,
+                 size_t             buflen,
                  uint8_t *          setme )
 {
     size_t   bytesLeft;
     uint32_t offset = 0;
-    int      success = TRUE;
+    tr_bool  success = TRUE;
+    uint8_t  stackbuf[MAX_STACK_ARRAY_SIZE];
     SHA_CTX  sha;
 
-    assert( tor );
-    assert( setme );
+    /* fallback buffer */
+    if( ( buffer == NULL ) || ( buflen < 1 ) )
+    {
+        buffer = stackbuf;
+        buflen = sizeof( stackbuf );
+    }
+
+    assert( tor != NULL );
     assert( pieceIndex < tor->info.pieceCount );
+    assert( buffer != NULL );
+    assert( buflen > 0 );
+    assert( setme != NULL );
 
     SHA1_Init( &sha );
@@ -230 +242 @@
     while( bytesLeft )
     {
-        uint8_t buf[MAX_STACK_ARRAY_SIZE];
-        const int len = MIN( bytesLeft, sizeof( buf ) );
-        success = !tr_ioRead( tor, pieceIndex, offset, len, buf );
+        const int len = MIN( bytesLeft, buflen );
+        success = !tr_ioRead( tor, pieceIndex, offset, len, buffer );
         if( !success )
             break;
-        SHA1_Update( &sha, buf, len );
+        SHA1_Update( &sha, buffer, len );
         offset += len;
         bytesLeft -= len;
@@ -246 +257 @@
 }
 
-int
-tr_ioTestPiece( const tr_torrent * tor,
-                int                pieceIndex )
+tr_bool
+tr_ioTestPiece( const tr_torrent  * tor,
+                tr_piece_index_t    pieceIndex,
+                void              * buffer,
+                size_t              buflen )
 {
     uint8_t hash[SHA_DIGEST_LENGTH];
-    const int recalculated = recalculateHash( tor, pieceIndex, hash );
-    return recalculated && !memcmp( hash, tor->info.pieces[pieceIndex].hash, SHA_DIGEST_LENGTH );
-}
-
+
+    return recalculateHash( tor, pieceIndex, buffer, buflen, hash )
+           && !memcmp( hash, tor->info.pieces[pieceIndex].hash, SHA_DIGEST_LENGTH );
+}

trunk/libtransmission/inout.h

@@ -53 +53 @@
 
 /**
- * returns nonzero if the piece matches its metainfo's SHA1 checksum.
+ * @brief Test to see if the piece matches its metainfo's SHA1 checksum.
+ *
+ * @param optionalBuffer if calling tr_ioTestPiece() repeatedly, you can
+ *                       get best performance by providing a buffer with
+ *                       tor->info.pieceSize bytes.
  */
-int tr_ioTestPiece( const tr_torrent*,
-                    int   piece );
+tr_bool tr_ioTestPiece( const tr_torrent * tor,
+                        tr_piece_index_t   piece,
+                        void             * optionalBuffer,
+                        size_t             optionalBufferLen );
 
 

trunk/libtransmission/peer-mgr.c

@@ -1090 +1090 @@
             {
                 const tr_piece_index_t p = e->pieceIndex;
-                const tr_bool ok = tr_ioTestPiece( tor, p );
+                const tr_bool ok = tr_ioTestPiece( tor, p, NULL, 0 );
 
                 if( !ok )

trunk/libtransmission/verify.c

@@ -61 +61 @@
 
 static int
-checkFile( tr_torrent *    tor,
-           tr_file_index_t fileIndex,
-           int *           abortFlag )
+checkFile( tr_torrent      * tor,
+           void            * buffer,
+           size_t            buflen,
+           tr_file_index_t   fileIndex,
+           int             * abortFlag )
 {
     tr_piece_index_t i;
@@ -85 +87 @@
         else if( !tr_torrentIsPieceChecked( tor, i ) )
         {
-            const int      wasComplete = tr_cpPieceIsComplete(
-                tor->completion, i );
-
-            if( tr_ioTestPiece( tor, i ) ) /* yay */
+            const int wasComplete = tr_cpPieceIsComplete( tor->completion, i );
+
+            if( tr_ioTestPiece( tor, i, buffer, buflen ) ) /* yay */
             {
                 tr_torrentSetHasPiece( tor, i, TRUE );
@@ -120 +121 @@
 verifyThreadFunc( void * unused UNUSED )
 {
-    for( ; ; )
+    for( ;; )
     {
         int                  changed = 0;
         tr_file_index_t      i;
-        tr_torrent *         tor;
+        tr_torrent         * tor;
         struct verify_node * node;
+        void               * buffer;
 
         tr_lockLock( getVerifyLock( ) );
@@ -142 +144 @@
         tr_lockUnlock( getVerifyLock( ) );
 
+        tr_torinf( tor, _( "Verifying torrent" ) );
         tor->verifyState = TR_VERIFY_NOW;
-
-        tr_torinf( tor, _( "Verifying torrent" ) );
+        buffer = tr_new( uint8_t, tor->info.pieceSize );
         for( i = 0; i < tor->info.fileCount && !stopCurrent; ++i )
-            changed |= checkFile( tor, i, &stopCurrent );
-
+            changed |= checkFile( tor, buffer, tor->info.pieceSize, i, &stopCurrent );
+        tr_free( buffer );
         tor->verifyState = TR_VERIFY_NONE;