Changeset 12373

Timestamp:

Apr 19, 2011, 3:23:04 PM (12 years ago)

Author:

jordan

Message:

(trunk libt) #4164 "FD_SETSIZE impact on open-file-limit and peer-limit-global" -- commit patch by romanr to take FD_SETSIZE into account before calling setrlimit()

File:

• trunk/libtransmission/fdlimit.c (modified) (1 diff)

trunk/libtransmission/fdlimit.c

@@ -782 +782 @@
         struct rlimit rlim;
         const int NOFILE_BUFFER = 512;
-        const int open_max = sysconf( _SC_OPEN_MAX );
+        const int open_max = MIN( FD_SETSIZE, sysconf( _SC_OPEN_MAX ) );
         getrlimit( RLIMIT_NOFILE, &rlim );
         rlim.rlim_cur = MAX( 1024, open_max );
         rlim.rlim_cur = MIN( rlim.rlim_cur, rlim.rlim_max );
         setrlimit( RLIMIT_NOFILE, &rlim );
-        tr_dbg( "setrlimit( RLIMIT_NOFILE, %d )", (int)rlim.rlim_cur );
+        tr_dbg( "setrlimit( RLIMIT_NOFILE, %d ); FD_SETSIZE = %d", (int)rlim.rlim_cur, FD_SETSIZE );
         gFd->socket_limit = MIN( socket_limit, (int)rlim.rlim_cur - NOFILE_BUFFER );
     }