Changeset 7142

Timestamp:

Nov 23, 2008, 5:27:39 PM (14 years ago)

Author:

charles

Message:

(1.4x libT) backport file preallocation improvements #1482 and #1486

Location:

branches/1.4x/libtransmission

Files:

• fdlimit.c (modified) (6 diffs)
• inout.c (modified) (6 diffs)

branches/1.4x/libtransmission/fdlimit.c

@@ -23 +23 @@
  *****************************************************************************/
 
+#ifndef WIN32
+ #define HAVE_GETRLIMIT
+#endif
+
 #include <assert.h>
 #include <errno.h>
@@ -39 +43 @@
 #include <sys/types.h>
 #include <sys/stat.h>
+#ifdef HAVE_GETRLIMIT
+ #include <sys/time.h> /* getrlimit */
+ #include <sys/resource.h> /* getrlimit */
+#endif
 #include <unistd.h>
 #include <fcntl.h> /* O_LARGEFILE */
@@ -96 +104 @@
 ***/
 
+#ifndef O_LARGEFILE
+#define O_LARGEFILE 0
+#endif
+
 static int
-preallocateFile( int fd UNUSED, uint64_t length UNUSED )
-{
-#ifdef HAVE_FALLOCATE
-
-    return fallocate( fd, FALLOC_FL_KEEP_SIZE, 0, length );
-
-#elif defined(HAVE_POSIX_FALLOCATE)
-
-    return posix_fallocate( fd, 0, length );
-
-#elif defined(SYS_DARWIN) 
-
-    fstore_t fst;
-    fst.fst_flags = F_ALLOCATECONTIG;
-    fst.fst_posmode = F_PEOFPOSMODE;
-    fst.fst_offset = 0;
-    fst.fst_length = length;
-    fst.fst_bytesalloc = 0;
-    return fcntl( fd, F_PREALLOCATE, &fst );
+preallocateFile( const char * filename, uint64_t length )
+{
+    int success = 0;
+
+#ifdef WIN32
+
+    HANDLE hFile = CreateFile( filename, GENERIC_WRITE, 0, 0, CREATE_NEW, 0, 0 );
+    if( hFile != INVALID_HANDLE_VALUE )
+    {
+        LARGE_INTEGER li;
+        li.QuadPart = length;
+        success = SetFilePointerEx( hFile, li, NULL, FILE_BEGIN ) && SetEndOfFile( hFile );
+        CloseHandle( hFile );
+    }
 
 #else
 
-    #warning no known method to preallocate files on this platform
-    return -1;
-
-#endif
+    int flags = O_RDWR | O_CREAT | O_LARGEFILE;
+    int fd = open( filename, flags, 0666 );
+    if( fd >= 0 )
+    {
+        
+# ifdef HAVE_FALLOCATE
+
+        success = !fallocate( fd, FALLOC_FL_KEEP_SIZE, 0, length );
+
+# elif defined(HAVE_POSIX_FALLOCATE)
+
+        success = !posix_fallocate( fd, 0, length );
+
+# elif defined(SYS_DARWIN) 
+
+        fstore_t fst;
+        fst.fst_flags = F_ALLOCATECONTIG;
+        fst.fst_posmode = F_PEOFPOSMODE;
+        fst.fst_offset = 0;
+        fst.fst_length = length;
+        fst.fst_bytesalloc = 0;
+        success = !fcntl( fd, F_PREALLOCATE, &fst );
+
+# else
+
+        #warning no known method to preallocate files on this platform
+        success = 0;
+
+# endif
+
+        close( fd );
+    }
+
+#endif
+
+    return success;
 }
 
@@ -162 +201 @@
 
     alreadyExisted = !stat( filename, &sb ) && S_ISREG( sb.st_mode );
+
+    if( doWrite && !alreadyExisted && doPreallocate )
+        if( preallocateFile( filename, desiredFileSize ) )
+            tr_inf( _( "Preallocated file \"%s\"" ), filename );
     
     /* open the file */
@@ -181 +224 @@
     }
 
-    if( ( file->fd >= 0 ) && !alreadyExisted && doPreallocate )
-        if( !preallocateFile( file->fd, desiredFileSize ) )
-            tr_inf( _( "Preallocated file \"%s\"" ), filename );
-       
     tr_free( filename );
     return 0;
@@ -501 +540 @@
     gFd = tr_new0( struct tr_fd_s, 1 );
     gFd->lock = tr_lockNew( );
+
+#ifdef HAVE_GETRLIMIT
+    {
+        struct rlimit rlim;
+        getrlimit( RLIMIT_NOFILE, &rlim );
+        rlim.rlim_cur = MIN( rlim.rlim_max,
+                            (rlim_t)( globalPeerLimit + NOFILE_BUFFER ) );
+        setrlimit( RLIMIT_NOFILE, &rlim );
+        gFd->socketMax = rlim.rlim_cur - NOFILE_BUFFER;
+        tr_dbg( "setrlimit( RLIMIT_NOFILE, %d )", (int)rlim.rlim_cur );
+    }
+#else
     gFd->socketMax = globalPeerLimit;
+#endif
     tr_dbg( "%d usable file descriptors", globalPeerLimit );
 

branches/1.4x/libtransmission/inout.c

@@ -36 +36 @@
 
 #ifdef WIN32
- #define lseek _lseeki64
  #if defined(read)
-    #undef read
+  #undef read
  #endif
  #define read  _read
  
  #if defined(write)
-    #undef write
+  #undef write
  #endif
  #define write _write
@@ -49 +48 @@
 
 enum { TR_IO_READ, TR_IO_WRITE };
+
+static int64_t
+tr_lseek( int fd, int64_t offset, int whence )
+{
+#if defined(_LARGEFILE_SOURCE)
+    return lseek64( fd, (off64_t)offset, whence );
+#elif defined(WIN32)
+    return _lseeki64( fd, offset, whence );
+#else
+    return lseek( fd, (off_t)offset, whence );
+#endif
+}
 
 /* returns 0 on success, or an errno on failure */
@@ -86 +97 @@
     else if( ( fd = tr_fdFileCheckout ( tor->downloadDir, file->name, ioMode == TR_IO_WRITE, !file->dnd, file->length ) ) < 0 )
         err = errno;
-    else if( lseek( fd, (off_t)fileOffset, SEEK_SET ) == ( (off_t)-1 ) )
+    else if( tr_lseek( fd, (int64_t)fileOffset, SEEK_SET ) == -1 )
         err = errno;
     else if( func( fd, buf, buflen ) != buflen )
@@ -118 +129 @@
                        tr_piece_index_t   pieceIndex,
                        uint32_t           pieceOffset,
-                       tr_file_index_t *  fileIndex,
-                       uint64_t *         fileOffset )
-{
-    const uint64_t  offset = tr_pieceOffset( tor, pieceIndex, pieceOffset,
-                                             0 );
+                       tr_file_index_t  * fileIndex,
+                       uint64_t         * fileOffset )
+{
+    const uint64_t  offset = tr_pieceOffset( tor, pieceIndex, pieceOffset, 0 );
     const tr_file * file;
 
@@ -136 +146 @@
     assert( tor->info.files[*fileIndex].offset + *fileOffset == offset );
 }
-
-#ifdef WIN32
-/* return 0 on success, or an errno on failure */
-static int
-ensureMinimumFileSize( const tr_torrent * tor,
-                       tr_file_index_t    fileIndex,
-                       uint64_t           minBytes )
-{
-    int             fd;
-    int             err;
-    struct stat     sb;
-    const tr_file * file = &tor->info.files[fileIndex];
-
-    assert( 0 <= fileIndex && fileIndex < tor->info.fileCount );
-    assert( minBytes <= file->length );
-
-    fd = tr_fdFileCheckout( tor->downloadDir,
-                            file->name, TRUE, !file->dnd, file->length );
-
-    if( fd < 0 ) /* bad fd */
-        err = errno;
-    else if( fstat ( fd, &sb ) ) /* how big is the file? */
-        err = errno;
-    else if( sb.st_size >= (off_t)minBytes ) /* already big enough */
-        err = 0;
-    else if( !ftruncate( fd, minBytes ) )  /* grow it */
-        err = 0;
-    else /* couldn't grow it */
-        err = errno;
-
-    if( fd >= 0 )
-        tr_fdFileReturn( fd );
-
-    return err;
-}
-
-#endif
 
 /* returns 0 on success, or an errno on failure */
@@ -202 +175 @@
                                              file->length - fileOffset );
 
-#ifdef WIN32
-        if( ioMode == TR_IO_WRITE )
-            err = ensureMinimumFileSize( tor, fileIndex,
-                                         fileOffset + bytesThisPass );
-        if( !err )
-#endif
         err = readOrWriteBytes( tor, ioMode,
                                 fileIndex, fileOffset, buf, bytesThisPass );