Changeset 10186

Timestamp:

Feb 12, 2010, 7:59:30 PM (12 years ago)

Author:

charles

Message:

(trunk libT) use valloc() and st.st_blksize when verifying local data

Location:

trunk

Files:

• configure.ac (modified) (1 diff)
• libtransmission/verify.c (modified) (4 diffs)

trunk/configure.ac

@@ -109 +109 @@
 AC_HEADER_TIME
 
-AC_CHECK_FUNCS([pread pwrite lrintf strlcpy daemon dirname basename strcasecmp localtime_r fallocate64 posix_fallocate memmem strtold syslog])
+AC_CHECK_FUNCS([pread pwrite lrintf strlcpy daemon dirname basename strcasecmp localtime_r fallocate64 posix_fallocate memmem strtold syslog valloc])
 AC_PROG_INSTALL
 AC_PROG_MAKE_SET

trunk/libtransmission/verify.c

@@ -20 +20 @@
  #include <fcntl.h> /* posix_fadvise() / fcntl() */
 #endif
+#if defined(SYS_DARWIN)
+ #define HAVE_VALLOC
+#endif
 
 #include <openssl/sha.h>
@@ -58 +61 @@
     tr_file_index_t fileIndex = 0;
     tr_piece_index_t pieceIndex = 0;
-    const int64_t buflen = tor->info.pieceSize;
-    uint8_t * buffer = tr_new( uint8_t, buflen );
+    uint8_t * buffer = NULL;
+    int64_t buflen = 0;
     const time_t begin = tr_time( );
     time_t end;
@@ -85 +88 @@
             fd = filename == NULL ? -1 : tr_open_file_for_scanning( filename );
             /* fprintf( stderr, "opening file #%d (%s) -- %d\n", fileIndex, filename, fd ); */
+            if( ( fd >= 0 ) && ( buffer == NULL ) )
+            {
+                struct stat st;
+                buflen = fstat( fd, &st ) ? 4096 : st.st_blksize;
+#ifdef HAVE_VALLOC
+                buffer = valloc( buflen );
+#else
+                buffer = malloc( buflen );
+#endif
+            }
             tr_free( filename );
         }
@@ -165 +178 @@
     if( fd >= 0 )
         tr_close_file( fd );
-    tr_free( buffer );
+    free( buffer );
 
     /* stopwatch */