[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co...
|
From: |
mldonkey-commits |
|
Subject: |
[Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co... |
|
Date: |
Tue, 21 Nov 2006 22:34:35 +0000 |
CVSROOT: /sources/mldonkey
Module name: mldonkey
Changes by: spiralvoice <spiralvoice> 06/11/21 22:34:34
Modified files:
distrib : ChangeLog
src/daemon/common: commonComplexOptions.ml commonGlobals.ml
commonOptions.ml commonSources.ml
commonUploads.ml
src/daemon/driver: driverCommands.ml driverInteractive.ml
driverInterface.ml
src/networks/direct_connect: dcClients.ml
src/networks/donkey: donkeyClient.ml donkeyComplexOptions.ml
donkeyFiles.ml donkeyOneFile.ml
donkeyOptions.ml donkeyServers.ml
src/networks/fasttrack: fasttrackPandora.ml
src/networks/gnutella: gnutellaClients.ml gnutellaHandler.ml
src/utils/net : basicSocket.ml basicSocket.mli http_client.ml
http_server.ml tcpBufferedSocket.ml
udpSocket.ml
Log message:
patch #5579
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1107&r2=1.1108
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/common/commonComplexOptions.ml?cvsroot=mldonkey&r1=1.68&r2=1.69
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/common/commonGlobals.ml?cvsroot=mldonkey&r1=1.75&r2=1.76
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/common/commonOptions.ml?cvsroot=mldonkey&r1=1.188&r2=1.189
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/common/commonSources.ml?cvsroot=mldonkey&r1=1.38&r2=1.39
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/common/commonUploads.ml?cvsroot=mldonkey&r1=1.50&r2=1.51
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/driver/driverCommands.ml?cvsroot=mldonkey&r1=1.198&r2=1.199
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/driver/driverInteractive.ml?cvsroot=mldonkey&r1=1.114&r2=1.115
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/driver/driverInterface.ml?cvsroot=mldonkey&r1=1.59&r2=1.60
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/direct_connect/dcClients.ml?cvsroot=mldonkey&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/donkey/donkeyClient.ml?cvsroot=mldonkey&r1=1.108&r2=1.109
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/donkey/donkeyComplexOptions.ml?cvsroot=mldonkey&r1=1.58&r2=1.59
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/donkey/donkeyFiles.ml?cvsroot=mldonkey&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/donkey/donkeyOneFile.ml?cvsroot=mldonkey&r1=1.45&r2=1.46
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/donkey/donkeyOptions.ml?cvsroot=mldonkey&r1=1.55&r2=1.56
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/donkey/donkeyServers.ml?cvsroot=mldonkey&r1=1.65&r2=1.66
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/fasttrack/fasttrackPandora.ml?cvsroot=mldonkey&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/gnutella/gnutellaClients.ml?cvsroot=mldonkey&r1=1.44&r2=1.45
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/gnutella/gnutellaHandler.ml?cvsroot=mldonkey&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/utils/net/basicSocket.ml?cvsroot=mldonkey&r1=1.30&r2=1.31
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/utils/net/basicSocket.mli?cvsroot=mldonkey&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/utils/net/http_client.ml?cvsroot=mldonkey&r1=1.34&r2=1.35
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/utils/net/http_server.ml?cvsroot=mldonkey&r1=1.35&r2=1.36
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/utils/net/tcpBufferedSocket.ml?cvsroot=mldonkey&r1=1.44&r2=1.45
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/utils/net/udpSocket.ml?cvsroot=mldonkey&r1=1.21&r2=1.22
Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1107
retrieving revision 1.1108
diff -u -b -r1.1107 -r1.1108
--- distrib/ChangeLog 21 Nov 2006 22:29:58 -0000 1.1107
+++ distrib/ChangeLog 21 Nov 2006 22:34:33 -0000 1.1108
@@ -15,6 +15,8 @@
=========
2006/11/21
+5579: Remove BasicSocket.[mini|maxi], replace them with Pervasives functions
+- small fix for DonkeyOptions.max_allowed_connected_servers
5578: Remove unused files
- src/utils/net/tcpClientSocket.ml
- src/utils/net/tcpClientSocket.mli
Index: src/daemon/common/commonComplexOptions.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/common/commonComplexOptions.ml,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -b -r1.68 -r1.69
--- src/daemon/common/commonComplexOptions.ml 13 Nov 2006 13:14:49 -0000
1.68
+++ src/daemon/common/commonComplexOptions.ml 21 Nov 2006 22:34:33 -0000
1.69
@@ -1241,7 +1241,7 @@
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 + reserved_fds
+ (max (List.length !!files) !!max_concurrent_downloads) +
!!max_upload_slots + reserved_fds
in
let wanted_socks = !!max_opened_connections + total_files in
@@ -1258,7 +1258,7 @@
else
begin
let new_max_opened_connections =
- maxi (max_all_sockets - total_files) (max_all_sockets / 2)
+ max (max_all_sockets - total_files) (max_all_sockets / 2)
in
lprintf_nl "max_opened_connections is set too high (%d), reducing to %d"
!!max_opened_connections new_max_opened_connections;
Index: src/daemon/common/commonGlobals.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/common/commonGlobals.ml,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -b -r1.75 -r1.76
--- src/daemon/common/commonGlobals.ml 14 Nov 2006 11:23:11 -0000 1.75
+++ src/daemon/common/commonGlobals.ml 21 Nov 2006 22:34:33 -0000 1.76
@@ -117,7 +117,7 @@
with e -> slen
in
let diff_len_utf8_ascii = slen - len in
- let max_len = maxi limit 10 in
+ let max_len = max limit 10 in
if len > max_len then
let prefix = String.sub name 0 (max_len - 7 + diff_len_utf8_ascii) in
let suffix = String.sub name (len - 4 + diff_len_utf8_ascii) 4 in
@@ -177,7 +177,7 @@
cc.control_state <- cc.control_state + 1
let connection_next_try cc =
- cc.control_last_try + mini (cc.control_min_reask * cc.control_state)
+ cc.control_last_try + min (cc.control_min_reask * cc.control_state)
cc.control_min_reask
let connection_can_try cc =
@@ -238,7 +238,7 @@
float_of_int (if !!max_hard_upload_rate = 0 then
10000 * 1024
else
- maxi (!!max_hard_upload_rate * 1024) 1024) *. 0.90;
+ max (!!max_hard_upload_rate * 1024) 1024) *. 0.90;
);
option_hook max_hard_download_rate (fun _ ->
check_ul_dl_ratio ();
@@ -672,13 +672,13 @@
done
let detected_link_capacity link =
- List.fold_left maxi 0 (Fifo.to_list link)
+ List.fold_left max 0 (Fifo.to_list link)
let detected_uplink_capacity () =
- List.fold_left maxi 0 (Fifo.to_list upload_history)
+ List.fold_left max 0 (Fifo.to_list upload_history)
let detected_downlink_capacity () =
- List.fold_left maxi 0 (Fifo.to_list download_history)
+ List.fold_left max 0 (Fifo.to_list download_history)
let new_tag name v =
Index: src/daemon/common/commonOptions.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/common/commonOptions.ml,v
retrieving revision 1.188
retrieving revision 1.189
diff -u -b -r1.188 -r1.189
--- src/daemon/common/commonOptions.ml 19 Nov 2006 23:03:42 -0000 1.188
+++ src/daemon/common/commonOptions.ml 21 Nov 2006 22:34:33 -0000 1.189
@@ -1792,7 +1792,7 @@
(!!minor_heap_size * 1024) };
);
option_hook client_buffer_size (fun _ ->
- TcpBufferedSocket.max_buffer_size := maxi 10000000 !!client_buffer_size
+ TcpBufferedSocket.max_buffer_size := max 10000000 !!client_buffer_size
);
if Autoconf.has_gd then
option_hook html_mods_vd_gfx_png (fun _ ->
Index: src/daemon/common/commonSources.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/common/commonSources.ml,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -b -r1.38 -r1.39
--- src/daemon/common/commonSources.ml 12 Nov 2006 12:34:50 -0000 1.38
+++ src/daemon/common/commonSources.ml 21 Nov 2006 22:34:33 -0000 1.39
@@ -1760,7 +1760,7 @@
(* calc sources queue size
at least 3 sources per file*)
- let nsources = maxi (!nfiles*3)
+ let nsources = max (!nfiles*3)
(functions.function_max_connections_per_second () * 10) in
(* calc how much sources a file can get according to its priority*)
Index: src/daemon/common/commonUploads.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/common/commonUploads.ml,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -b -r1.50 -r1.51
--- src/daemon/common/commonUploads.ml 14 Nov 2006 11:23:11 -0000 1.50
+++ src/daemon/common/commonUploads.ml 21 Nov 2006 22:34:33 -0000 1.51
@@ -934,7 +934,7 @@
estimated_capacity
else
(* max_hard_upload_rate lowered manually,... *)
- mini estimated_capacity (!!max_hard_upload_rate * 1024) in
+ min estimated_capacity (!!max_hard_upload_rate * 1024) in
if !verbose_upload then
lprintf_nl "usage: %d(%d) capacity: %d"
(short_delay_upload_usage ())
Index: src/daemon/driver/driverCommands.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/driver/driverCommands.ml,v
retrieving revision 1.198
retrieving revision 1.199
diff -u -b -r1.198 -r1.199
--- src/daemon/driver/driverCommands.ml 19 Nov 2006 23:03:42 -0000 1.198
+++ src/daemon/driver/driverCommands.ml 21 Nov 2006 22:34:33 -0000 1.199
@@ -992,7 +992,7 @@
let num = int_of_string num in
if num > 0 then (* we want to disable upload for a short time *)
- let num = mini !CommonUploads.upload_credit num in
+ let num = min !CommonUploads.upload_credit num in
CommonUploads.has_upload := !CommonUploads.has_upload + num;
CommonUploads.upload_credit := !CommonUploads.upload_credit - num;
Printf.sprintf
@@ -1003,7 +1003,7 @@
if num < 0 && !CommonUploads.has_upload > 0 then
(* we want to restart upload probably *)
let num = - num in
- let num = mini num !CommonUploads.has_upload in
+ let num = min num !CommonUploads.has_upload in
CommonUploads.has_upload := !CommonUploads.has_upload - num;
CommonUploads.upload_credit := !CommonUploads.upload_credit + num;
Printf.sprintf
Index: src/daemon/driver/driverInteractive.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/driver/driverInteractive.ml,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -b -r1.114 -r1.115
--- src/daemon/driver/driverInteractive.ml 13 Nov 2006 13:08:43 -0000
1.114
+++ src/daemon/driver/driverInteractive.ml 21 Nov 2006 22:34:33 -0000
1.115
@@ -2130,8 +2130,8 @@
let len_dir = ref 9 in
let len_strategy = ref 29 in (* "shared (incoming_directories)" *)
List.iter ( fun (dir, strategy) ->
- len_dir := maxi !len_dir (String.length dir);
- len_strategy := maxi !len_strategy (String.length strategy)
+ len_dir := max !len_dir (String.length dir);
+ len_strategy := max !len_strategy (String.length strategy)
) !list;
let fill_dir = String.make (!len_dir - 9) ' ' in
let fill_dir_line = String.make (!len_dir - 9) '-' in
@@ -2180,8 +2180,8 @@
end
else
Printf.bprintf buf "%-*s|%-*s|%8s|%8s|%5s|%-s\n"
- (maxi !len_dir (!len_dir - String.length dir)) dir
- (maxi !len_strategy (!len_strategy - String.length strategy))
strategy
+ (max !len_dir (!len_dir - String.length dir)) dir
+ (max !len_strategy (!len_strategy - String.length strategy))
strategy
diskused diskfree percentfree filesystem
) !list;
if html then
Index: src/daemon/driver/driverInterface.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/driver/driverInterface.ml,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -b -r1.59 -r1.60
--- src/daemon/driver/driverInterface.ml 12 Nov 2006 14:17:45 -0000
1.59
+++ src/daemon/driver/driverInterface.ml 21 Nov 2006 22:34:33 -0000
1.60
@@ -700,7 +700,7 @@
add_timer 60. (fun _ ->
gui_send gui (Search_waiting (search_num, 0))
);
- gui.gui_id_counter <- maxi gui.gui_id_counter search_num;
+ gui.gui_id_counter <- max gui.gui_id_counter search_num;
let user = gui.gui_conn.conn_user in
let query =
Index: src/networks/direct_connect/dcClients.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/direct_connect/dcClients.ml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- src/networks/direct_connect/dcClients.ml 10 Apr 2006 19:16:36 -0000
1.12
+++ src/networks/direct_connect/dcClients.ml 21 Nov 2006 22:34:33 -0000
1.13
@@ -273,7 +273,7 @@
let rec refill sock =
lprintf "FILL SOCKET"; lprint_newline ();
let len = remaining_to_write sock in
- let can = maxi (8192 - len) 0 in
+ let can = max (8192 - len) 0 in
if can > 0 then
match c.client_download with
DcUploadList list ->
@@ -281,7 +281,7 @@
let slen = String.length list in
let pos = Int64.to_int c.client_pos in
if pos < slen then begin
- let send_len = mini (slen - pos) can in
+ let send_len = min (slen - pos) can in
lprintf "Sending %d" send_len; lprint_newline ();
TcpBufferedSocket.write sock list pos send_len;
lprintf "sent"; lprint_newline ();
Index: src/networks/donkey/donkeyClient.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/donkey/donkeyClient.ml,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -b -r1.108 -r1.109
--- src/networks/donkey/donkeyClient.ml 21 Nov 2006 21:38:00 -0000 1.108
+++ src/networks/donkey/donkeyClient.ml 21 Nov 2006 22:34:33 -0000 1.109
@@ -2009,7 +2009,7 @@
let module Q = M.QueryBloc in
let file = find_file t.Q.md4 in
let prio = (file_priority file) in
- let client_upload_lifetime = ref ((maxi 0 !!upload_lifetime) * 60) in
+ let client_upload_lifetime = ref ((max 0 !!upload_lifetime) * 60) in
begin
if !!dynamic_upload_lifetime
Index: src/networks/donkey/donkeyComplexOptions.ml
===================================================================
RCS file:
/sources/mldonkey/mldonkey/src/networks/donkey/donkeyComplexOptions.ml,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -b -r1.58 -r1.59
--- src/networks/donkey/donkeyComplexOptions.ml 19 Sep 2006 17:07:43 -0000
1.58
+++ src/networks/donkey/donkeyComplexOptions.ml 21 Nov 2006 22:34:33 -0000
1.59
@@ -193,7 +193,7 @@
with _ -> ());
(try
connection_set_last_conn l.server_connection_control
- (normalize_time (mini (get_value "server_age" value_to_int)
+ (normalize_time (min (get_value "server_age" value_to_int)
(BasicSocket.last_time ())));
with _ -> ());
as_server l.server_server
Index: src/networks/donkey/donkeyFiles.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/donkey/donkeyFiles.ml,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- src/networks/donkey/donkeyFiles.ml 25 Oct 2006 11:12:38 -0000 1.21
+++ src/networks/donkey/donkeyFiles.ml 21 Nov 2006 22:34:33 -0000 1.22
@@ -130,7 +130,7 @@
end else
let max_len = up.up_end_chunk -- up.up_pos in
let max_len = Int64.to_int max_len in
- let msg_block_size_int = mini msg_block_size_int per_client in
+ let msg_block_size_int = min msg_block_size_int per_client in
if max_len <= msg_block_size_int then
(* last block from chunk *)
begin
@@ -165,7 +165,7 @@
do_if_connected c.client_source.DonkeySources.source_sock (fun sock ->
(* lprintf "upload_to_client %d connected\n" (maxi max_msg_size size); *)
- let size = mini max_msg_size size in
+ let size = min max_msg_size size in
send_client_block c sock size;
(match c.client_upload with
None -> ()
Index: src/networks/donkey/donkeyOneFile.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/donkey/donkeyOneFile.ml,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -b -r1.45 -r1.46
--- src/networks/donkey/donkeyOneFile.ml 25 Oct 2006 11:12:38 -0000
1.45
+++ src/networks/donkey/donkeyOneFile.ml 21 Nov 2006 22:34:34 -0000
1.46
@@ -272,7 +272,7 @@
| _ -> assert false
in
let msg = M.QueryBlocReq msg in
- set_read_power sock (!!upload_power + maxi 0 (file_priority file));
+ set_read_power sock (!!upload_power + max 0 (file_priority file));
(* lprintf "QUEUE DOWNLOAD REQUEST\n"; *)
(* CommonUploads.queue_download_request (fun _ -> *)
client_send c msg
Index: src/networks/donkey/donkeyOptions.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/donkey/donkeyOptions.ml,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -b -r1.55 -r1.56
--- src/networks/donkey/donkeyOptions.ml 20 Nov 2006 22:48:43 -0000
1.55
+++ src/networks/donkey/donkeyOptions.ml 21 Nov 2006 22:34:34 -0000
1.56
@@ -45,6 +45,10 @@
"The number of servers you want to stay connected to"
int_option 3
+let max_allowed_connected_servers () =
+ min (int_of_string ((strings_of_option
max_connected_servers).option_default))
+ !!max_connected_servers
+
let reliable_sources = define_option donkey_section ["reliable_sources"]
"Should mldonkey try to detect sources responsible for corruption and ban
them, currently disabled"
bool_option true
@@ -53,9 +57,6 @@
"Should mldonkey try to detect sources masquerading as others and ban them"
bool_option true
-let max_allowed_connected_servers () =
- BasicSocket.mini 5 !!max_connected_servers
-
let server_black_list = define_option donkey_section ["server_black_list"]
"A list of server IP to remove from server list. Can contain single IPs,
CIDR ranges, or begin-end ranges.
Servers on this list can't be added, and will eventually be removed"
Index: src/networks/donkey/donkeyServers.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/donkey/donkeyServers.ml,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -b -r1.65 -r1.66
--- src/networks/donkey/donkeyServers.ml 19 Nov 2006 23:02:18 -0000
1.65
+++ src/networks/donkey/donkeyServers.ml 21 Nov 2006 22:34:34 -0000
1.66
@@ -861,7 +861,7 @@
or is a preferred one *)
if (s.server_preferred && not ss.server_preferred)
|| (!!keep_best_server
- && mini ((Int64.to_int ss_nusers) + 1000)
+ && min ((Int64.to_int ss_nusers) + 1000)
((Int64.to_int ss_nusers) * 5)
< (Int64.to_int s_nusers)
)
Index: src/networks/fasttrack/fasttrackPandora.ml
===================================================================
RCS file:
/sources/mldonkey/mldonkey/src/networks/fasttrack/fasttrackPandora.ml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- src/networks/fasttrack/fasttrackPandora.ml 14 Dec 2005 21:17:46 -0000
1.9
+++ src/networks/fasttrack/fasttrackPandora.ml 21 Nov 2006 22:34:34 -0000
1.10
@@ -223,7 +223,7 @@
let check1 = check_xinu s (pos + 5 + len1) len (depth+1) in
let check2 = check_xinu s (pos + 5 + len2) len (depth+1) in
- maxi check0 (maxi check1 check2)
+ max check0 (max check1 check2)
else depth
| _ -> -10
Index: src/networks/gnutella/gnutellaClients.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/gnutella/gnutellaClients.ml,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -b -r1.44 -r1.45
--- src/networks/gnutella/gnutellaClients.ml 23 Sep 2006 22:27:51 -0000
1.44
+++ src/networks/gnutella/gnutellaClients.ml 21 Nov 2006 22:34:34 -0000
1.45
@@ -997,7 +997,7 @@
if get_request then
let pos = uc.uc_chunk_pos in
let to_write = uc.uc_chunk_end -- pos in
- let rlen = mini (max_refill sock) (Int64.to_int to_write) in
+ let rlen = min (max_refill sock) (Int64.to_int to_write) in
if !verbose_msg_clients then
lprintf "[GUP] to_write: %d/%Ld/%d\n" rlen to_write
(remaining_to_write sock);
Index: src/networks/gnutella/gnutellaHandler.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/gnutella/gnutellaHandler.ml,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- src/networks/gnutella/gnutellaHandler.ml 28 Aug 2006 18:19:16 -0000
1.15
+++ src/networks/gnutella/gnutellaHandler.ml 21 Nov 2006 22:34:34 -0000
1.16
@@ -180,7 +180,7 @@
let module M = QueryReply in
let module C = CommonUploads in
let replies = ref [] in
- for i = 0 to mini (Array.length files - 1) 9 do
+ for i = 0 to min (Array.length files - 1) 9 do
let sh, info = files.(i) in
let infos = ref [] in
List.iter (fun uid ->
Index: src/utils/net/basicSocket.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/utils/net/basicSocket.ml,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- src/utils/net/basicSocket.ml 17 May 2006 08:52:44 -0000 1.30
+++ src/utils/net/basicSocket.ml 21 Nov 2006 22:34:34 -0000 1.31
@@ -204,15 +204,9 @@
let minf (x: float) (y: float) =
if x > y then y else x
-let mini (x: int) (y: int) =
- if x > y then y else x
-
let maxf (x: float) (y: float) =
if x < y then y else x
-let maxi (x: int) (y: int) =
- if x < y then y else x
-
(*************************************************************************)
(* *)
(* Some functions *)
Index: src/utils/net/basicSocket.mli
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/utils/net/basicSocket.mli,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- src/utils/net/basicSocket.mli 28 Oct 2005 08:21:49 -0000 1.15
+++ src/utils/net/basicSocket.mli 21 Nov 2006 22:34:34 -0000 1.16
@@ -75,9 +75,7 @@
val stats : Buffer.t -> t -> unit
-val mini : int -> int -> int
val minf : float -> float -> float
-val maxi : int -> int -> int
val maxf : float -> float -> float
val set_allow_write : t -> bool ref -> unit
Index: src/utils/net/http_client.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/utils/net/http_client.ml,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- src/utils/net/http_client.ml 25 Oct 2006 11:34:46 -0000 1.34
+++ src/utils/net/http_client.ml 21 Nov 2006 22:34:34 -0000 1.35
@@ -170,7 +170,7 @@
let b = TcpBufferedSocket.buf sock in
let end_pos = b.pos + b.len in
let new_pos = end_pos - nread in
- let new_pos = maxi 0 (new_pos - 1) in
+ let new_pos = max 0 (new_pos - 1) in
(*
lprintf "received [%s]" (String.escaped
(String.sub b.buf new_pos nread));
@@ -380,7 +380,7 @@
if nread > 0 then begin
let left =
if maxlen >= 0 then
- mini (maxlen - !file_size) nread
+ min (maxlen - !file_size) nread
else nread
in
Buffer.add_string file_buf (String.sub buf.buf buf.pos left);
@@ -452,7 +452,7 @@
if nread > 0 then begin
let left =
if maxlen >= 0 then
- mini (maxlen - !file_size) nread
+ min (maxlen - !file_size) nread
else nread
in
Buffer.add_string file_buf (String.sub buf.buf buf.pos left);
Index: src/utils/net/http_server.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/utils/net/http_server.ml,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- src/utils/net/http_server.ml 12 Nov 2006 12:42:56 -0000 1.35
+++ src/utils/net/http_server.ml 21 Nov 2006 22:34:34 -0000 1.36
@@ -785,7 +785,7 @@
let b = TcpBufferedSocket.buf sock in
let end_pos = b.pos + b.len in
let new_pos = end_pos - nread in
- let new_pos = maxi 0 (new_pos - 1) in
+ let new_pos = max 0 (new_pos - 1) in
(* lprintf "received [%s]\n" (String.escaped
(String.sub b.buf new_pos nread)); - log commented out *)
let rec iter i =
Index: src/utils/net/tcpBufferedSocket.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/utils/net/tcpBufferedSocket.ml,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -b -r1.44 -r1.45
--- src/utils/net/tcpBufferedSocket.ml 31 Oct 2006 15:41:55 -0000 1.44
+++ src/utils/net/tcpBufferedSocket.ml 21 Nov 2006 22:34:34 -0000 1.45
@@ -319,7 +319,7 @@
forecast_download t 0
let best_packet_size nbytes =
- let nbytes = maxi nbytes !minimal_packet_size in
+ let nbytes = max nbytes !minimal_packet_size in
let nip_packets = 1 + nbytes / !mtu_packet_size in
let headers = nip_packets * !ip_packet_size in
let nframes = 1 + (nbytes + headers) / packet_frame_size in
@@ -411,7 +411,7 @@
lprintf "[TCP_BS]: BUFFER OVERFLOW %d+%d> %d " b.len len
b.max_buf_size ;
lprintf "MESSAGE: [";
- for i = pos1 to pos1 + (mini len 20) - 1 do
+ for i = pos1 to pos1 + (min len 20) - 1 do
lprintf "(%d)" (int_of_char s.[i]);
done;
if len > 20 then lprintf "...";
@@ -422,7 +422,7 @@
socket !!! *)
end
else
- let new_len = mini (maxi (2 * max_len) (b.len + len)) b.max_buf_size in
+ let new_len = min (max (2 * max_len) (b.len + len)) b.max_buf_size in
(* if t.monitored then
(lprintf "Allocate new for %d\n" len; ); *)
let new_buf = String.create new_len in
@@ -631,8 +631,8 @@
buf_len - b.len
)
else
- let new_len = mini
- (maxi
+ let new_len = min
+ (max
(2 * buf_len) (b.len + min_read_size)) b.max_buf_size
in
let new_buf = String.create new_len in
@@ -645,7 +645,7 @@
in
b.buf, b.pos+b.len, can_write_in_buffer
in
- let can_read = mini max_len buffer_len in
+ let can_read = min max_len buffer_len in
if can_read > 0 then
let old_len = b.len in
let nread = try
@@ -684,8 +684,8 @@
end else
b.len <- b.len + nread;
(* lprintf " %d\n" nread; *)
- b.min_buf_size <- mini b.max_buf_size (
- maxi (nread + nread / 2) min_read_size);
+ b.min_buf_size <- min b.max_buf_size (
+ max (nread + nread / 2) min_read_size);
(*
if nread = can_read then begin
@@ -1677,9 +1677,9 @@
List.iter (fun t ->
if bc.remaining_bytes > 0 then
- let nconnections = maxi bc.nconnections 1 in
- let can_read = maxi 1 (bc.remaining_bytes / nconnections)
in
- let can_read = maxi !ip_packet_size (can_read *
t.read_power) in
+ let nconnections = max bc.nconnections 1 in
+ let can_read = max 1 (bc.remaining_bytes / nconnections) in
+ let can_read = max !ip_packet_size (can_read *
t.read_power) in
(try
(* lprintf "allow to read %d\n" can_read; *)
can_read_handler t t.sock_in can_read
@@ -1728,14 +1728,14 @@
end;
List.iter (fun t ->
if bc.remaining_bytes > 0 then
- let nconnections = maxi bc.nconnections 1 in
- let can_write = maxi 1 (bc.remaining_bytes / nconnections)
in
+ let nconnections = max bc.nconnections 1 in
+ let can_write = max 1 (bc.remaining_bytes / nconnections)
in
let can_write = best_packet_size (can_write *
t.write_power)
in
let old_nwrite = t.nwrite in
(try
(* lprintf "WRITE\n"; *)
- can_write_handler t t.sock_out (mini can_write
t.wbuf.len)
+ can_write_handler t t.sock_out (min can_write
t.wbuf.len)
with _ -> ());
bc.remaining_bytes <- bc.remaining_bytes -
t.nwrite + old_nwrite;
Index: src/utils/net/udpSocket.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/utils/net/udpSocket.ml,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- src/utils/net/udpSocket.ml 31 Oct 2006 15:41:55 -0000 1.21
+++ src/utils/net/udpSocket.ml 21 Nov 2006 22:34:34 -0000 1.22
@@ -448,7 +448,7 @@
let udp_user total n =
if !verbose_bandwidth > 0 then
lprintf_nl "udp_user %d/%d" n total;
- let n = if total = 0 then 100000 else n in
+(* let n = if total = 0 then 100000 else n in *)
udp_bc.base_time <- udp_bc.base_time + 1;
if udp_bc.count = 0 then begin
udp_bc.count <- 10;
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co..., (continued)
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co..., mldonkey-commits, 2006/11/12
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co..., mldonkey-commits, 2006/11/13
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co..., mldonkey-commits, 2006/11/13
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co..., mldonkey-commits, 2006/11/14
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co..., mldonkey-commits, 2006/11/14
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co..., mldonkey-commits, 2006/11/14
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co..., mldonkey-commits, 2006/11/14
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co..., mldonkey-commits, 2006/11/15
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co..., mldonkey-commits, 2006/11/19
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co..., mldonkey-commits, 2006/11/19
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co...,
mldonkey-commits <=
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co..., mldonkey-commits, 2006/11/26
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co..., mldonkey-commits, 2006/11/26
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co..., mldonkey-commits, 2006/11/28
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co..., mldonkey-commits, 2006/11/28