Changeset 12363

Timestamp:

Apr 16, 2011, 10:33:29 PM (12 years ago)

Author:

jordan

Message:

(trunk libT) #4165 "FD_SETSIZE impact on open-file-limit and peer-limit-global" -- add safety guard in the file cache to prevent too many open files.

File:

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

trunk/libtransmission/fdlimit.c

@@ -747 +747 @@
 tr_fdSetFileLimit( tr_session * session, int limit )
 {
+    int max;
+
+    /* This is a vaguely arbitrary number.
+       It takes announcer.c's MAX_CONCURRENT_TASKS into account,
+       plus extra positions for the listening sockets,
+       plus a few more just to be safe */
+    const int buffer_slots = 128;
+
     ensureSessionFdInfoExists( session );
+
+    max = __FD_SETSIZE - session->fdInfo->socket_limit - buffer_slots;
+    if( limit > max )
+        limit = max;
 
     if( limit != tr_fdGetFileLimit( session ) )