Changeset 7720

Timestamp:

Jan 16, 2009, 4:38:16 PM (12 years ago)

Author:

charles

Message:

(trunk libT) make file preallocation optional via settings.json. choices are: full, sparse, and none

Location:

trunk/libtransmission

Files:

• fdlimit.c (modified) (6 diffs)
• fdlimit.h (modified) (2 diffs)
• inout.c (modified) (2 diffs)
• session.c (modified) (3 diffs)
• session.h (modified) (1 diff)
• transmission.h (modified) (3 diffs)

trunk/libtransmission/fdlimit.c

@@ -109 +109 @@
 #endif
 
-static int
-preallocateFile( const char * filename, uint64_t length )
-{
-    int success = 0;
+static tr_bool
+preallocateFileSparse( int fd, uint64_t length )
+{
+    const char zero = '\0';
+
+    if( length == 0 )
+        return TRUE;
+
+    if( lseek( fd, length-1, SEEK_SET ) == -1 )
+        return FALSE;
+    if( write( fd, &zero, 1 ) == -1 )
+        return FALSE;
+    if( ftruncate( fd, length ) == -1 )
+        return FALSE;
+
+    return TRUE;
+}
+
+static tr_bool
+preallocateFileFull( const char * filename, uint64_t length )
+{
+    tr_bool success = 0;
 
 #ifdef WIN32
@@ -171 +189 @@
  */
 static int
-TrOpenFile( int          i,
-            const char * folder,
-            const char * torrentFile,
-            int          doWrite,
-            int          doPreallocate,
-            uint64_t     desiredFileSize )
+TrOpenFile( int                      i,
+            const char             * folder,
+            const char             * torrentFile,
+            tr_bool                  doWrite,
+            tr_preallocation_mode    preallocationMode,
+            uint64_t                 desiredFileSize )
 {
     struct tr_openfile * file = &gFd->openFiles[i];
@@ -203 +221 @@
     alreadyExisted = !stat( filename, &sb ) && S_ISREG( sb.st_mode );
 
-    if( doWrite && !alreadyExisted && doPreallocate )
-        if( preallocateFile( filename, desiredFileSize ) )
+    if( doWrite && !alreadyExisted && ( preallocationMode == TR_PREALLOCATE_FULL ) )
+        if( preallocateFileFull( filename, desiredFileSize ) )
             tr_inf( _( "Preallocated file \"%s\"" ), filename );
     
@@ -225 +243 @@
     }
 
+    if( doWrite && !alreadyExisted && ( preallocationMode == TR_PREALLOCATE_SPARSE ) )
+        preallocateFileSparse( file->fd, desiredFileSize );
+
     tr_free( filename );
     return 0;
@@ -257 +278 @@
 /* returns an fd on success, or a -1 on failure and sets errno */
 int
-tr_fdFileCheckout( const char * folder,
-                   const char * torrentFile,
-                   int          doWrite,
-                   int          doPreallocate,
-                   uint64_t     desiredFileSize )
+tr_fdFileCheckout( const char             * folder,
+                   const char             * torrentFile,
+                   tr_bool                  doWrite,
+                   tr_preallocation_mode    preallocationMode,
+                   uint64_t                 desiredFileSize )
 {
     int i, winner = -1;
@@ -359 +380 @@
     if( !fileIsOpen( o ) )
     {
-        const int err = TrOpenFile( winner, folder, torrentFile, doWrite, doPreallocate, desiredFileSize );
+        const int err = TrOpenFile( winner, folder, torrentFile, doWrite, preallocationMode, desiredFileSize );
         if( err ) {
             tr_lockUnlock( gFd->lock );

trunk/libtransmission/fdlimit.h

@@ -27 +27 @@
 #endif
 
+#include "transmission.h"
 #include "net.h"
 
@@ -51 +52 @@
  * @see tr_fdFileClose
  */
-int  tr_fdFileCheckout( const char * folder,
-                        const char * torrentFile,
-                        int          doWrite,
-                        int          doPreallocate,
-                        uint64_t     desiredFileSize );
+int  tr_fdFileCheckout( const char             * folder,
+                        const char             * torrentFile,
+                        tr_bool                  doWrite,
+                        tr_preallocation_mode    preallocationMode,
+                        uint64_t                 desiredFileSize );
 
 /**

trunk/libtransmission/inout.c

@@ -72 +72 @@
     const tr_info * info = &tor->info;
     const tr_file * file = &info->files[fileIndex];
+    tr_preallocation_mode preallocationMode;
 
     typedef size_t ( *iofunc )( int, void *, size_t );
@@ -94 +95 @@
         return 0;
 
+    if( ( file->dnd ) || ( ioMode != TR_IO_WRITE ) )
+        preallocationMode = TR_PREALLOCATE_NONE;
+    else
+        preallocationMode = tor->session->preallocationMode;
+
     if( ( ioMode == TR_IO_READ ) && !fileExists ) /* does file exist? */
         err = errno;
-    else if( ( fd = tr_fdFileCheckout ( tor->downloadDir, file->name, ioMode == TR_IO_WRITE, !file->dnd, file->length ) ) < 0 )
+    else if( ( fd = tr_fdFileCheckout ( tor->downloadDir, file->name, ioMode == TR_IO_WRITE, preallocationMode, file->length ) ) < 0 )
         err = errno;
     else if( tr_lseek( fd, (int64_t)fileOffset, SEEK_SET ) == -1 )

trunk/libtransmission/session.c

@@ -238 +238 @@
     tr_bencDictAddInt( d, TR_PREFS_KEY_PEX_ENABLED,              TRUE );
     tr_bencDictAddInt( d, TR_PREFS_KEY_PORT_FORWARDING,          TRUE );
+    tr_bencDictAddInt( d, TR_PREFS_KEY_PREALLOCATION,            TR_PREALLOCATE_SPARSE );
     tr_bencDictAddStr( d, TR_PREFS_KEY_PROXY,                    "" );
     tr_bencDictAddInt( d, TR_PREFS_KEY_PROXY_AUTH_ENABLED,       FALSE );
@@ -283 +284 @@
     tr_bencDictAddInt( d, TR_PREFS_KEY_PEX_ENABLED,              s->isPexEnabled );
     tr_bencDictAddInt( d, TR_PREFS_KEY_PORT_FORWARDING,          tr_sessionIsPortForwardingEnabled( s ) );
+    tr_bencDictAddInt( d, TR_PREFS_KEY_PREALLOCATION,            s->preallocationMode );
     tr_bencDictAddStr( d, TR_PREFS_KEY_PROXY,                    s->proxy );
     tr_bencDictAddInt( d, TR_PREFS_KEY_PROXY_AUTH_ENABLED,       s->isProxyAuthEnabled );
@@ -404 +406 @@
     found = tr_bencDictFindInt( &settings, TR_PREFS_KEY_ENCRYPTION, &i ); 
     assert( found ); 
+    assert( tr_isEncryptionMode( i ) );
     session->encryptionMode = i; 
+
+    found = tr_bencDictFindInt( &settings, TR_PREFS_KEY_PREALLOCATION, &i );
+    assert( found );
+    assert( tr_isPreallocationMode( i ) );
+    session->preallocationMode = i;
  
     found = tr_bencDictFindInt( &settings, TR_PREFS_KEY_PEER_SOCKET_TOS, &i ); 

trunk/libtransmission/session.h

@@ -71 +71 @@
 
     tr_encryption_mode           encryptionMode;
+
+    tr_preallocation_mode        preallocationMode;
 
     struct tr_event_handle *     events;

trunk/libtransmission/transmission.h

@@ -107 +107 @@
 typedef enum
 {
+    TR_PREALLOCATE_NONE   = 0,
+    TR_PREALLOCATE_SPARSE = 1,
+    TR_PREALLOCATE_FULL   = 2
+}
+tr_preallocation_mode;
+
+static TR_INLINE tr_bool tr_isPreallocationMode( tr_preallocation_mode m  )
+{
+    return ( m == TR_PREALLOCATE_NONE )
+        || ( m == TR_PREALLOCATE_SPARSE )
+        || ( m == TR_PREALLOCATE_FULL );
+}
+
+typedef enum
+{
     TR_PROXY_HTTP,
     TR_PROXY_SOCKS4,
@@ -120 +135 @@
 }
 tr_encryption_mode;
+
+static TR_INLINE tr_bool tr_isEncryptionMode( tr_encryption_mode m )
+{
+    return ( m == TR_CLEAR_PREFERRED )
+        || ( m == TR_ENCRYPTION_PREFERRED )
+        || ( m == TR_ENCRYPTION_REQUIRED );
+}
+
 
 #define TR_DEFAULT_OPEN_FILE_LIMIT_STR "32"
@@ -147 +170 @@
 #define TR_PREFS_KEY_PORT_FORWARDING            "port-forwarding-enabled"
 #define TR_PREFS_KEY_PROXY_AUTH_ENABLED         "proxy-auth-enabled"
+#define TR_PREFS_KEY_PREALLOCATION              "preallocation"
 #define TR_PREFS_KEY_PROXY_ENABLED              "proxy-enabled"
 #define TR_PREFS_KEY_PROXY_PASSWORD             "proxy-auth-password"