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

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       07/03/04 22:18:16

Modified files:
        distrib        : ChangeLog 
        src/daemon/common: commonOptions.ml 
        src/utils/net  : tcpBufferedSocket.ml tcpBufferedSocket.mli 

Log message:
        patch #5765

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1195&r2=1.1196
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/common/commonOptions.ml?cvsroot=mldonkey&r1=1.201&r2=1.202
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/utils/net/tcpBufferedSocket.ml?cvsroot=mldonkey&r1=1.45&r2=1.46
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/utils/net/tcpBufferedSocket.mli?cvsroot=mldonkey&r1=1.16&r2=1.17

Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1195
retrieving revision 1.1196
diff -u -b -r1.1195 -r1.1196
--- distrib/ChangeLog   4 Mar 2007 21:31:40 -0000       1.1195
+++ distrib/ChangeLog   4 Mar 2007 22:18:16 -0000       1.1196
@@ -15,6 +15,9 @@
 =========
 
 2007/03/04
+5765: Change hard-coded maximum value for client_buffer_size
+- default stays at 500.000
+- for high-volume links raise this value to 1.000.000 or higher
 5767: HTML: Improve bw_stats
 5768: New default for option messages_filter (thx to atordo)
 5766: Windows/Unicode: Fix broken get_info function for non-ascii filenames

Index: src/daemon/common/commonOptions.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/common/commonOptions.ml,v
retrieving revision 1.201
retrieving revision 1.202
diff -u -b -r1.201 -r1.202
--- src/daemon/common/commonOptions.ml  4 Mar 2007 21:30:00 -0000       1.201
+++ src/daemon/common/commonOptions.ml  4 Mar 2007 22:18:16 -0000       1.202
@@ -1534,7 +1534,8 @@
     int_option 50
 
 let client_buffer_size = define_expert_option current_section 
["client_buffer_size"]
-  "Maximal size of the buffers of a client"
+  "Maximal size in byte of the buffers of a client, minimum 50.000 byte.
+For high-volume links raise this value to 1.000.000 or higher."
     int_option 500000
 
 let save_options_delay = define_expert_option current_section 
["save_options_delay"]
@@ -1804,7 +1805,7 @@
         (!!minor_heap_size * 1024) };
   );
   option_hook client_buffer_size (fun _ ->
-      TcpBufferedSocket.max_buffer_size := max 10000000 !!client_buffer_size
+      TcpBufferedSocket.max_buffer_size := max 50000 !!client_buffer_size
   );
   if Autoconf.has_gd then begin
     option_hook html_mods_vd_gfx_png (fun _ ->

Index: src/utils/net/tcpBufferedSocket.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/utils/net/tcpBufferedSocket.ml,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -b -r1.45 -r1.46
--- src/utils/net/tcpBufferedSocket.ml  21 Nov 2006 22:34:34 -0000      1.45
+++ src/utils/net/tcpBufferedSocket.ml  4 Mar 2007 22:18:16 -0000       1.46
@@ -30,7 +30,7 @@
 let opened_connections = ref 0
 let opened_connections_this_second = ref 0
 
-let max_buffer_size = ref 10000000
+let max_buffer_size = ref 50000
 
 let bind_address = ref Unix.inet_addr_any
 let ip_packet_size = ref 40
@@ -464,7 +464,6 @@
       t.wbuf.max_buf_size t.wbuf.len len; *)
   b
 let not_buffer_more t max =  t.wbuf.len < max
-let can_fill t = t.wbuf.len < (t.wbuf.max_buf_size / 2)
 let get_rtimeout t = get_rtimeout t.sock_in
 let max_refill t = t.wbuf.max_buf_size - t.wbuf.len
 
@@ -1836,6 +1835,7 @@
       Printf.bprintf buf "  to_deflate: %d\n" (List.length !to_deflate);
       Printf.bprintf buf "  max_opened_connections: %d\n" 
(!max_opened_connections ());
       Printf.bprintf buf "  max_connections_per_second: %d\n" 
(!max_connections_per_second ());
+      Printf.bprintf buf "  max_buffer_size: %d\n" (!max_buffer_size);
   );
   add_infinite_timer 1.0 proc_net_timer
 

Index: src/utils/net/tcpBufferedSocket.mli
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/utils/net/tcpBufferedSocket.mli,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- src/utils/net/tcpBufferedSocket.mli 31 Oct 2006 15:41:55 -0000      1.16
+++ src/utils/net/tcpBufferedSocket.mli 4 Mar 2007 22:18:16 -0000       1.17
@@ -103,7 +103,6 @@
   
 val stats :  Buffer.t -> t -> unit
 val buf_size : t -> int * int
-val can_fill : t -> bool
   
 (* val if_possible : bandwidth_controler -> int -> bool *)