Changeset 11603

Timestamp:

Dec 28, 2010, 8:38:55 AM (12 years ago)

Author:

charles

Message:

(trunk libT) more fdlimit futzing

Location:

trunk/libtransmission

Files:

• fdlimit.c (modified) (10 diffs)
• fdlimit.h (modified) (1 diff)

trunk/libtransmission/fdlimit.c

@@ -73 +73 @@
 
 static tr_bool
-preallocateFileSparse( int fd, uint64_t length )
+preallocate_file_sparse( int fd, uint64_t length )
 {
     const char zero = '\0';
@@ -95 +95 @@
 
 static tr_bool
-preallocateFileFull( const char * filename, uint64_t length )
+preallocate_file_full( const char * filename, uint64_t length )
 {
     tr_bool success = 0;
@@ -376 +376 @@
 
     if( writable && !alreadyExisted && ( allocation == TR_PREALLOCATE_FULL ) )
-        if( preallocateFileFull( filename, file_size ) )
+        if( preallocate_file_full( filename, file_size ) )
             tr_dbg( "Preallocated file \"%s\"", filename );
 
@@ -409 +409 @@
 
     if( writable && !alreadyExisted && ( allocation == TR_PREALLOCATE_SPARSE ) )
-        preallocateFileSparse( o->fd, file_size );
+        preallocate_file_sparse( o->fd, file_size );
 
     /* Many (most?) clients request blocks in ascending order,
@@ -426 +426 @@
 {
     struct tr_cached_file * begin;
-    struct tr_cached_file * end;
+    const struct tr_cached_file * end;
 };
 
@@ -458 +458 @@
     fileset_close_all( set );
     tr_free( set->begin );
-    set->begin = set->end = NULL;
+    set->end = set->begin = NULL;
 }
 
@@ -504 +504 @@
 }
 
+static int
+fileset_get_size( const struct tr_fileset * set )
+{
+    return set ? set->end - set->begin : 0;
+}
+
 /***
 ****
@@ -556 +562 @@
                    const char             * filename,
                    tr_bool                  writable,
-                   tr_preallocation_mode    preallocation_mode,
+                   tr_preallocation_mode    allocation,
                    uint64_t                 file_size )
 {
@@ -569 +575 @@
     if( !cached_file_is_open( o ) )
     {
-        const int err = cached_file_open( o, filename, writable, preallocation_mode, file_size );
+        const int err = cached_file_open( o, filename, writable, allocation, file_size );
         if( err ) {
             errno = err;
@@ -738 +744 @@
 
 int
-tr_fdGetFileLimit( const tr_session * session )
-{
-    const struct tr_fileset * set = session && session->fdInfo ? &session->fdInfo->fileset : NULL;
-    return set ? set->end - set->begin : 0;
+tr_fdGetFileLimit( tr_session * session )
+{
+    return fileset_get_size( get_fileset( session ) );
 }
 

trunk/libtransmission/fdlimit.h

@@ -25 +25 @@
 void tr_fdSetFileLimit( tr_session * session, int limit );
 
-int tr_fdGetFileLimit( const tr_session * session );
+int tr_fdGetFileLimit( tr_session * session );
 
 void tr_fdSetGlobalPeerLimit( tr_session * session, int limit );