[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: |
Sun, 05 Nov 2006 14:09:39 +0000 |
CVSROOT: /sources/mldonkey
Module name: mldonkey
Changes by: spiralvoice <spiralvoice> 06/11/05 14:09:39
Modified files:
distrib : ChangeLog
src/daemon/common: commonClient.ml commonUploads.ml
src/networks/bittorrent: bTClients.ml
src/networks/donkey: donkeyOvernet.ml
Log message:
patch #5521
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1075&r2=1.1076
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/common/commonClient.ml?cvsroot=mldonkey&r1=1.32&r2=1.33
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/common/commonUploads.ml?cvsroot=mldonkey&r1=1.48&r2=1.49
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/bittorrent/bTClients.ml?cvsroot=mldonkey&r1=1.83&r2=1.84
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/donkey/donkeyOvernet.ml?cvsroot=mldonkey&r1=1.71&r2=1.72
Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1075
retrieving revision 1.1076
diff -u -b -r1.1075 -r1.1076
--- distrib/ChangeLog 31 Oct 2006 15:42:48 -0000 1.1075
+++ distrib/ChangeLog 5 Nov 2006 14:09:38 -0000 1.1076
@@ -14,6 +14,10 @@
ChangeLog
=========
+2006/11/05
+5521: BT: Fix non-working EDK upload when BT is enabled,
+ introduced by patch 5461
+
2006/10/31
5508: OV/KAD eMule style search and some small fixes (bogeyman)
5486: UDP bandwidth monitor fix (bogeyman)
Index: src/daemon/common/commonClient.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/common/commonClient.ml,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- src/daemon/common/commonClient.ml 31 Oct 2006 15:40:05 -0000 1.32
+++ src/daemon/common/commonClient.ml 5 Nov 2006 14:09:38 -0000 1.33
@@ -400,6 +400,7 @@
let counter = ref 0 in
H.iter (fun _ -> incr counter) clients_by_num;
Printf.bprintf buf " clients: %d\n" !counter;
+ Printf.bprintf buf " uploaders: %d\n" (Intmap.length !uploaders);
)
let clients_get_all () =
Index: src/daemon/common/commonUploads.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/common/commonUploads.ml,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -b -r1.48 -r1.49
--- src/daemon/common/commonUploads.ml 25 Oct 2006 11:12:38 -0000 1.48
+++ src/daemon/common/commonUploads.ml 5 Nov 2006 14:09:38 -0000 1.49
@@ -279,15 +279,6 @@
let shared_counter = ref (Int64.zero)
let shared_files = Hashtbl.create 13
-let _ =
- Heap.add_memstat "CommonUploads" (fun level buf ->
- Printf.bprintf buf " infos_by_name: %d\n" (Hashtbl.length infos_by_name);
- Printf.bprintf buf " shareds_by_uid: %d\n" (Hashtbl.length shareds_by_uid);
- Printf.bprintf buf " shareds_by_id: %d\n" (Hashtbl.length shareds_by_id);
- Printf.bprintf buf " shared_files: %d\n" (Hashtbl.length shared_files);
- )
-
-
let new_shared_dir dirname = {
shared_dirname = dirname;
shared_files = [];
@@ -1072,3 +1063,12 @@
| l -> l
in
get_name_keywords
+
+let _ =
+ Heap.add_memstat "CommonUploads" (fun level buf ->
+ Printf.bprintf buf " infos_by_name: %d\n" (Hashtbl.length infos_by_name);
+ Printf.bprintf buf " shareds_by_uid: %d\n" (Hashtbl.length shareds_by_uid);
+ Printf.bprintf buf " shareds_by_id: %d\n" (Hashtbl.length shareds_by_id);
+ Printf.bprintf buf " shared_files: %d\n" (Hashtbl.length shared_files);
+ Printf.bprintf buf " pending_slots: %d\n" (Intmap.length
!pending_slots_map);
+ )
Index: src/networks/bittorrent/bTClients.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/bittorrent/bTClients.ml,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -b -r1.83 -r1.84
--- src/networks/bittorrent/bTClients.ml 25 Oct 2006 11:12:38 -0000
1.83
+++ src/networks/bittorrent/bTClients.ml 5 Nov 2006 14:09:38 -0000
1.84
@@ -214,6 +214,15 @@
t.tracker_url (t.tracker_interval - (last_time () -
t.tracker_last_conn)) file.file_name
) enabled_trackers
+let start_upload c =
+ set_client_upload (as_client c) (as_file c.client_file);
+ set_client_has_a_slot (as_client c) NormalSlot;
+ Rate.update_no_change c.client_downloaded_rate;
+ Rate.update_no_change c.client_upload_rate;
+ c.client_last_optimist <- last_time();
+ client_enter_upload_queue (as_client c);
+ send_client c Unchoke
+
(** In this function we decide which peers will be
uploaders. We send a choke message to current uploaders
that are not in the next uploaders list. We send Unchoke
@@ -231,15 +240,8 @@
) !current_uploaders;
(*don't send Choke if new uploader is already an uploaders *)
- List.iter ( fun c -> if ((List.mem c !current_uploaders)==false) then
- begin
- set_client_has_a_slot (as_client c) NormalSlot;
- Rate.update_no_change c.client_downloaded_rate;
- Rate.update_no_change c.client_upload_rate;
- c.client_last_optimist <- last_time();
- client_enter_upload_queue (as_client c);
- send_client c Unchoke;
- end
+ List.iter ( fun c ->
+ if not (List.mem c !current_uploaders) then start_upload c
) !next_uploaders;
current_uploaders := !next_uploaders
@@ -873,12 +875,7 @@
*)
current_uploaders := c::(!current_uploaders);
c.client_sent_choke <- false;
- set_client_has_a_slot (as_client c) NormalSlot;
- Rate.update_no_change c.client_downloaded_rate;
- Rate.update_no_change c.client_upload_rate;
- c.client_last_optimist <- last_time();
- client_enter_upload_queue (as_client c);
- send_client c Unchoke;
+ start_upload c
end;
(* Check if the client is still interesting for us... *)
@@ -903,12 +900,7 @@
don't miss the opportunity if we can *)
current_uploaders := c::(!current_uploaders);
c.client_sent_choke <- false;
- set_client_has_a_slot (as_client c) NormalSlot;
- Rate.update_no_change c.client_downloaded_rate;
- Rate.update_no_change c.client_upload_rate;
- c.client_last_optimist <- last_time();
- client_enter_upload_queue (as_client c);
- send_client c Unchoke;
+ start_upload c
end
else
begin
Index: src/networks/donkey/donkeyOvernet.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/donkey/donkeyOvernet.ml,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -b -r1.71 -r1.72
--- src/networks/donkey/donkeyOvernet.ml 31 Oct 2006 15:42:48 -0000
1.71
+++ src/networks/donkey/donkeyOvernet.ml 5 Nov 2006 14:09:39 -0000
1.72
@@ -1301,7 +1301,6 @@
(* Start unstarted searches, retry stalled searches *)
let overnet_search_tick () =
- let overnet_query_peer_period = int_of_float !!overnet_query_peer_period in
List.iter (fun s ->
(* Start a search, if search_start is reached *)
if (s.search_lifetime + s.search_start - 20) > last_time () &&
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co..., mldonkey-commits, 2006/11/05
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co...,
mldonkey-commits <=
- [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/12
- [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