Changeset 9797

Timestamp:

Dec 18, 2009, 7:05:36 AM (12 years ago)

Author:

charles

Message:

(trunk libT) possibly reduce the frequency of the "too many open files" errors

File:

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

trunk/libtransmission/fdlimit.c

@@ -54 +54 @@
  #include <sys/resource.h> /* getrlimit */
 #endif
+#include <fcntl.h> /* O_LARGEFILE posix_fadvise */
 #include <unistd.h>
-#include <fcntl.h> /* O_LARGEFILE posix_fadvise */
 
 #include <evutil.h>
@@ -77 +77 @@
 ***
 **/
-
-enum
-{
-    NOFILE_BUFFER = 512, /* the process' number of open files is
-                            globalMaxPeers + NOFILE_BUFFER */
-};
 
 struct tr_openfile
@@ -823 +817 @@
 }
 
+static TR_INLINE int clamp( int val, int lo, int hi )
+{
+    if( val < lo ) val = lo;
+    if( val > hi ) val = hi;
+    return val;
+}
+    
+
 void
-tr_fdSetPeerLimit( tr_session * session, int limit )
+tr_fdSetPeerLimit( tr_session * session, int socketLimit )
 {
     struct tr_fdInfo * gFd;
@@ -835 +837 @@
     {
         struct rlimit rlim;
+        const int NOFILE_BUFFER = 512;
+        const int open_max = sysconf( _SC_OPEN_MAX );
         getrlimit( RLIMIT_NOFILE, &rlim );
-        rlim.rlim_cur = MIN( rlim.rlim_max, (rlim_t)( limit + NOFILE_BUFFER ) );
+        rlim.rlim_cur = clamp( open_max, 1024, rlim.rlim_max );
         setrlimit( RLIMIT_NOFILE, &rlim );
-        gFd->socketLimit = rlim.rlim_cur - NOFILE_BUFFER;
         tr_dbg( "setrlimit( RLIMIT_NOFILE, %d )", (int)rlim.rlim_cur );
+        gFd->socketLimit = MIN( socketLimit, (int)rlim.rlim_cur - NOFILE_BUFFER );
     }
 #else
-    gFd->socketLimit = limit;
-#endif
-    gFd->publicSocketLimit = limit;
-
-    tr_dbg( "%d usable file descriptors", limit );
+    gFd->socketLimit = socketLimit;
+#endif
+    gFd->publicSocketLimit = socketLimit;
+
+    tr_dbg( "socket limit is %d", (int)gFd->socketLimit );
 }