Changeset 7138

Timestamp:

Nov 23, 2008, 5:05:44 PM (12 years ago)

Author:

charles

Message:

(libT) revert r7099 based on forum feedback @ <​http://forum.transmissionbt.com/viewtopic.php?f=4&t=6485>

File:

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

trunk/libtransmission/fdlimit.c

@@ -23 +23 @@
  *****************************************************************************/
 
+#ifndef WIN32
+ #define HAVE_GETRLIMIT
+#endif
+
 #include <assert.h>
 #include <errno.h>
@@ -39 +43 @@
 #include <sys/types.h>
 #include <sys/stat.h>
+#ifdef HAVE_GETRLIMIT
+ #include <sys/time.h> /* getrlimit */
+ #include <sys/resource.h> /* getrlimit */
+#endif
 #include <unistd.h>
 #include <fcntl.h> /* O_LARGEFILE */
@@ -532 +540 @@
     gFd = tr_new0( struct tr_fd_s, 1 );
     gFd->lock = tr_lockNew( );
+
+#ifdef HAVE_GETRLIMIT
+    {
+        struct rlimit rlim;
+        getrlimit( RLIMIT_NOFILE, &rlim );
+        rlim.rlim_cur = MIN( rlim.rlim_max,
+                            (rlim_t)( globalPeerLimit + NOFILE_BUFFER ) );
+        setrlimit( RLIMIT_NOFILE, &rlim );
+        gFd->socketMax = rlim.rlim_cur - NOFILE_BUFFER;
+        tr_dbg( "setrlimit( RLIMIT_NOFILE, %d )", (int)rlim.rlim_cur );
+    }
+#else
     gFd->socketMax = globalPeerLimit;
+#endif
     tr_dbg( "%d usable file descriptors", globalPeerLimit );