[Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co...

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       06/08/16 19:12:55

Modified files:
        distrib        : ChangeLog 
        src/daemon/common: commonComplexOptions.ml 

Log message:
        patch #5309

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.964&r2=1.965
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/common/commonComplexOptions.ml?cvsroot=mldonkey&r1=1.58&r2=1.59

Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.964
retrieving revision 1.965
diff -u -b -r1.964 -r1.965
--- distrib/ChangeLog   16 Aug 2006 19:12:08 -0000      1.964
+++ distrib/ChangeLog   16 Aug 2006 19:12:42 -0000      1.965
@@ -15,6 +15,7 @@
 =========
 
 2006/08/16
+5309: Increase reserved number of FDs from 20 to 40 for dynamic libs
 5310: EDK: Request filelist from friends only when requested,
       disable automatic download (pango)
 5312: GTK2 GUI: Fix histograms (su_blanc)

Index: src/daemon/common/commonComplexOptions.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/common/commonComplexOptions.ml,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -b -r1.58 -r1.59
--- src/daemon/common/commonComplexOptions.ml   20 Jul 2006 15:30:21 -0000      
1.58
+++ src/daemon/common/commonComplexOptions.ml   16 Aug 2006 19:12:55 -0000      
1.59
@@ -1124,8 +1124,10 @@
     max_opened_connections =:= min_conns
   end;
 
+  let reserved_fds = 40 in (* ini files, dynamic libs, etc. *)
+
   let total_files = (* maximum number of files in use at the same time *)
-    (maxi (List.length !!files) !!max_concurrent_downloads) + 
!!max_upload_slots + 20 (* ini files etc. *)
+    (maxi (List.length !!files) !!max_concurrent_downloads) + 
!!max_upload_slots + reserved_fds
   in
 
   let wanted_socks = !!max_opened_connections + total_files in
@@ -1156,7 +1158,7 @@
   TcpBufferedSocket.set_max_opened_connections
     (fun _ -> !!max_opened_connections);
 
-  Unix32.max_cache_size := total_files - 20;
+  Unix32.max_cache_size := total_files - reserved_fds;
   calc_real_max_indirect_connections ()
 )