Changeset 3674 for trunk/libtransmission/fdlimit.c

Timestamp:

Nov 1, 2007, 1:47:32 PM (15 years ago)

Author:

charles

Message:

finish cleaning up the code that was churned during the "corruption" fix.

File:

• trunk/libtransmission/fdlimit.c (modified) (12 diffs)

trunk/libtransmission/fdlimit.c

@@ -90 +90 @@
 enum
 {
+    TR_MAX_SOCKETS = 1024,
+
     TR_MAX_OPEN_FILES = 16, /* real files, not sockets */
 
@@ -126 +128 @@
 {
     struct tr_openfile * file = &gFd->open[i];
-    char * dir;
     int flags;
 
@@ -132 +133 @@
 
     /* create subfolders, if any */
-    dir = dirname( tr_strdup( filename ) );
-    if( write && tr_mkdirp( dir, 0700 ) ) {
-        free( dir );
-        return tr_ioErrorFromErrno( );
+    if( write ) {
+        char * dir = dirname( tr_strdup( filename ) );
+        const int val = tr_mkdirp( dir, 0700 );
+        tr_free( dir );
+        if( val )
+            return tr_ioErrorFromErrno( );
     }
 
@@ -145 +148 @@
     errno = 0;
     file->fd = open( filename, flags, 0600 );
-    free( dir );
     if( file->fd < 0 ) {
         if( errno ) {
@@ -233 +235 @@
     for( ;; )
     {
-        uint64_t date = tr_date() + 1;
+        uint64_t date = tr_date( ) + 1;
         winner = -1;
 
@@ -281 +283 @@
     dbgmsg( "checking out '%s' in slot %d", filename, winner );
     o->isCheckedOut = 1;
-    o->date = tr_date();
+    o->date = tr_date( );
     tr_lockUnlock( gFd->lock );
     return o->fd;
@@ -296 +298 @@
         if( o->fd == file ) {
             dbgmsg( "releasing file '%s' in slot #%d", o->filename, i );
-            if( o->isWritable )
-                fsync( o->fd ); /* fflush */
+            fsync( o->fd );
             o->isCheckedOut = 0;
             break;
@@ -329 +330 @@
 
 int
-tr_fdSocketCreate( int type, int priority )
+tr_fdSocketCreate( int type, int isReserved )
 {
     int s = -1;
     tr_lockLock( gFd->lock );
 
-    if( priority && gFd->reserved >= TR_RESERVED_FDS )
-        priority = FALSE;
-
-    if( priority || ( gFd->normal < gFd->normalMax ) )
+    if( isReserved && gFd->reserved >= TR_RESERVED_FDS )
+        isReserved = FALSE;
+
+    if( isReserved || ( gFd->normal < gFd->normalMax ) )
         if( ( s = socket( AF_INET, type, 0 ) ) < 0 )
             tr_err( "Couldn't create socket (%s)", strerror( sockerrno ) );
@@ -343 +344 @@
     if( s > -1 )
     {
-        setSocketPriority( s, priority );
-
-        if( priority )
+        setSocketPriority( s, isReserved );
+
+        if( isReserved )
             ++gFd->reserved;
         else
@@ -376 +377 @@
     if( s > -1 )
     {
-        setSocketPriority( s, 0 );
+        setSocketPriority( s, FALSE );
         *addr = sock.sin_addr;
         *port = sock.sin_port;
@@ -424 +425 @@
 tr_fdInit( void )
 {
-    int i, j, s[4096];
+    int i, j, s[TR_MAX_SOCKETS];
 
     assert( gFd == NULL );
@@ -433 +434 @@
 
     /* count the max number of sockets we can use */
-    for( i=0; i<4096; ++i )
+    for( i=0; i<TR_MAX_SOCKETS; ++i )
         if( ( s[i] = socket( AF_INET, SOCK_STREAM, 0 ) ) < 0 )
             break;