Changeset 5241

Timestamp:

Mar 13, 2008, 12:38:16 AM (14 years ago)

Author:

charles

Message:

#781: experimental commit on the "failed data" issue.

Location:

trunk/libtransmission

Files:

• inout.c (modified) (4 diffs)
• torrent.c (modified) (4 diffs)

trunk/libtransmission/inout.c

@@ -13 +13 @@
 #include <assert.h>
 #include <errno.h>
+#include <stdlib.h> /* realloc */
 #include <string.h> /* memcmp */
 
@@ -19 +20 @@
 #include <unistd.h>
 
-#include <openssl/sha.h>
-
 #include "transmission.h"
+#include "crypto.h"
 #include "fdlimit.h"
 #include "inout.h"
+#include "platform.h"
 #include "stats.h"
 #include "torrent.h"
@@ -221 +222 @@
                       uint8_t           * setme )
 {
-    int offset;
-    int bytesLeft;
-    uint8_t buf[4096];
+    static uint8_t * buf = NULL;
+    static int buflen = 0;
+    static tr_lock * lock = NULL;
+
+    int n;
+    tr_errno err;
     const tr_info * info;
-    SHA_CTX sha;
+
+    /* only check one block at a time to prevent disk thrashing.
+     * this also lets us reuse the same buffer each time. */
+    if( lock == NULL )
+        lock = tr_lockNew( );
+
+    tr_lockLock( lock );
 
     assert( tor != NULL );
@@ -232 +242 @@
 
     info = &tor->info;
-    offset = 0;
-    bytesLeft = tr_torPieceCountBytes( tor, pieceIndex );
-    SHA1_Init( &sha );
-
-    while( bytesLeft > 0 )
-    {
-        const int bytesThisPass = MIN( bytesLeft, (int)sizeof(buf) );
-        tr_errno err = tr_ioRead( tor, pieceIndex, offset, bytesThisPass, buf );
-        if( err )
-            return err;
-        SHA1_Update( &sha, buf, bytesThisPass );
-        bytesLeft -= bytesThisPass;
-        offset += bytesThisPass;
+    n = tr_torPieceCountBytes( tor, pieceIndex );
+
+    if( buflen < n ) {
+        buflen = n;
+        buf = tr_renew( uint8_t, buf, buflen );
     }
-
-    SHA1_Final( setme, &sha );
+        
+    err = tr_ioRead( tor, pieceIndex, 0, n, buf );
+    if( !err )
+        tr_sha1( setme, buf, n, NULL );
+
+    tr_lockUnlock( lock );
     return 0;
 }

trunk/libtransmission/torrent.c

@@ -42 +42 @@
 #include "verify.h"
 
+#define MAX_BLOCK_SIZE (1024*16)
+
 /***
 ****
@@ -290 +292 @@
      */
     tor->blockSize = info->pieceSize;
-    while( tor->blockSize > (1024*16) )
+    while( tor->blockSize > MAX_BLOCK_SIZE )
         tor->blockSize /= 2;
 
@@ -1296 +1298 @@
                       uint32_t           length )
 {
-    static const uint32_t MAX_REQUEST_BYTE_COUNT  = (16 * 1024);
     int err = 0;
 
@@ -1303 +1304 @@
     else if ( (int)offset >= tr_torPieceCountBytes( tor, (int)index ) )
         err = 2;
-    else if( length > MAX_REQUEST_BYTE_COUNT )
+    else if( length > MAX_BLOCK_SIZE )
         err = 3;
     else if( tr_pieceOffset( tor, index, offset, length ) > tor->info.totalSize )