[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: |
Fri, 03 Aug 2007 22:11:46 +0000 |
CVSROOT: /sources/mldonkey
Module name: mldonkey
Changes by: spiralvoice <spiralvoice> 07/08/03 22:11:46
Modified files:
distrib : ChangeLog
src/daemon/common: commonFile.ml guiDecoding.ml guiTypes.ml
src/networks/bittorrent: bTInteractive.ml
src/networks/direct_connect: dcInteractive.ml
src/networks/donkey: donkeyInteractive.ml
src/networks/fileTP: fileTPInteractive.ml
src/networks/gnutella: gnutellaInteractive.ml
Log message:
patch #6127
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1307&r2=1.1308
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/common/commonFile.ml?cvsroot=mldonkey&r1=1.75&r2=1.76
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/common/guiDecoding.ml?cvsroot=mldonkey&r1=1.71&r2=1.72
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/common/guiTypes.ml?cvsroot=mldonkey&r1=1.38&r2=1.39
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/bittorrent/bTInteractive.ml?cvsroot=mldonkey&r1=1.142&r2=1.143
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/direct_connect/dcInteractive.ml?cvsroot=mldonkey&r1=1.33&r2=1.34
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/donkey/donkeyInteractive.ml?cvsroot=mldonkey&r1=1.160&r2=1.161
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/fileTP/fileTPInteractive.ml?cvsroot=mldonkey&r1=1.58&r2=1.59
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/gnutella/gnutellaInteractive.ml?cvsroot=mldonkey&r1=1.72&r2=1.73
Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1307
retrieving revision 1.1308
diff -u -b -r1.1307 -r1.1308
--- distrib/ChangeLog 3 Aug 2007 22:07:54 -0000 1.1307
+++ distrib/ChangeLog 3 Aug 2007 22:11:45 -0000 1.1308
@@ -15,6 +15,7 @@
=========
2007/08/04
+6127: HTML: Display file_chunk_sizes/file_piece_size in vd <num>
6135: BT: Fix high CPU load when share_scan_interval = 0
due to buggy patch #6049 (thx to darkman)
-------------------------------------------------------------------------------
Index: src/daemon/common/commonFile.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/common/commonFile.ml,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -b -r1.75 -r1.76
--- src/daemon/common/commonFile.ml 17 Jun 2007 01:56:29 -0000 1.75
+++ src/daemon/common/commonFile.ml 3 Aug 2007 22:11:45 -0000 1.76
@@ -826,6 +826,13 @@
) ]
);
+ Printf.bprintf buf "\\</tr\\>\\<tr class=\\\"dl-%d\\\"\\>"
(html_mods_cntr ());
+ html_mods_td buf [
+ ("Chunk size", "sr br", "Chunk size");
+ ("", "sr", (match info.G.file_chunk_size with
+ Some v -> String.concat " " (List.map (fun v -> Printf.sprintf "%Ld"
v) v)
+ | None -> "unknown"))];
+
(match file_magic file with
Some magic ->
Printf.bprintf buf "\\</tr\\>\\<tr class=\\\"dl-%d\\\"\\>"
(html_mods_cntr ());
@@ -1232,6 +1239,7 @@
T.file_active_sources = 0;
T.file_sources = None;
T.file_chunks = None;
+ T.file_chunk_size = None;
T.file_availability = [];
T.file_format = FormatNotComputed 0;
T.file_chunks_age = [||];
Index: src/daemon/common/guiDecoding.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/common/guiDecoding.ml,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -b -r1.71 -r1.72
--- src/daemon/common/guiDecoding.ml 17 Jun 2007 01:28:24 -0000 1.71
+++ src/daemon/common/guiDecoding.ml 3 Aug 2007 22:11:45 -0000 1.72
@@ -635,6 +635,7 @@
if chunks <> "" then
Some (VerificationBitmap.of_string chunks)
else None;
+ file_chunk_size = None;
file_availability = availability;
file_download_rate = rate;
file_chunks_age = chunks_age;
Index: src/daemon/common/guiTypes.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/common/guiTypes.ml,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -b -r1.38 -r1.39
--- src/daemon/common/guiTypes.ml 26 May 2007 23:21:47 -0000 1.38
+++ src/daemon/common/guiTypes.ml 3 Aug 2007 22:11:45 -0000 1.39
@@ -52,6 +52,7 @@
mutable file_nclients: bool;
mutable file_state : bool;
mutable file_chunks : bool;
+ mutable file_chunk_size : bool;
mutable file_availability : bool;
mutable file_sources : bool;
mutable file_download_rate : bool;
@@ -75,6 +76,7 @@
file_nclients= true;
file_state = true;
file_chunks = true;
+ file_chunk_size = true;
file_availability = true;
file_sources = true;
file_download_rate = true;
@@ -126,6 +128,7 @@
mutable file_all_sources : int;
mutable file_state : file_state;
mutable file_chunks : VerificationBitmap.t option;
+ mutable file_chunk_size : int64 list option;
mutable file_availability : (int * string) list; (* MANY CHANGES *)
mutable file_sources : int list option;
mutable file_download_rate : float; (* LOT OF CHANGES *)
@@ -353,6 +356,7 @@
file_sources = None;
file_download_rate = 2.2;
file_chunks = Some (VerificationBitmap.of_string "1010100");
+ file_chunk_size = None;
file_downloaded = Int64.of_string "68758764";
file_availability = [0,""];
file_format = FormatUnknown;
Index: src/networks/bittorrent/bTInteractive.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/bittorrent/bTInteractive.ml,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -b -r1.142 -r1.143
--- src/networks/bittorrent/bTInteractive.ml 25 Jul 2007 19:25:48 -0000
1.142
+++ src/networks/bittorrent/bTInteractive.ml 3 Aug 2007 22:11:46 -0000
1.143
@@ -252,6 +252,11 @@
"" -> "-"
| _ -> file.file_encoding) ];
+ Printf.bprintf buf "\\</tr\\>\\<tr class=\\\"dl-%d\\\"\\>" (html_mods_cntr
());
+ html_mods_td buf [
+ ("Piece size", "sr br", "Piece size");
+ ("", "sr", Int64.to_string file.file_piece_size) ];
+
let rec print_first_tracker l =
match l with
| [] -> ()
@@ -579,6 +584,9 @@
P.file_chunks = (match file.file_swarmer with
| None -> None
| Some swarmer -> Some (CommonSwarming.chunks_verified_bitmap swarmer));
+ P.file_chunk_size = (match file.file_swarmer with
+ | None -> None
+ | Some t -> Some (List.map (fun t -> t.CommonSwarming.t_chunk_size)
t.CommonSwarming.t_s.CommonSwarming.s_networks));
P.file_availability =
[network.network_num,(match file.file_swarmer with
None -> "" | Some swarmer ->
@@ -613,6 +621,7 @@
P.file_sources = None;
P.file_download_rate = 0.;
P.file_chunks = None;
+ P.file_chunk_size = None;
P.file_availability = [network.network_num, ""];
P.file_format = FormatNotComputed 0;
P.file_chunks_age = [| last_time () |];
Index: src/networks/direct_connect/dcInteractive.ml
===================================================================
RCS file:
/sources/mldonkey/mldonkey/src/networks/direct_connect/dcInteractive.ml,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- src/networks/direct_connect/dcInteractive.ml 9 Jul 2007 23:45:44
-0000 1.33
+++ src/networks/direct_connect/dcInteractive.ml 3 Aug 2007 22:11:46
-0000 1.34
@@ -1439,6 +1439,7 @@
P.file_sources = None;
P.file_download_rate = file_download_rate file.file_file;
P.file_chunks = None;
+ P.file_chunk_size = None;
P.file_availability = [network.network_num, "0"];
P.file_format = FormatUnknown;
P.file_chunks_age = [|0|];
Index: src/networks/donkey/donkeyInteractive.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/donkey/donkeyInteractive.ml,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -b -r1.160 -r1.161
--- src/networks/donkey/donkeyInteractive.ml 24 Jun 2007 18:38:28 -0000
1.160
+++ src/networks/donkey/donkeyInteractive.ml 3 Aug 2007 22:11:46 -0000
1.161
@@ -1105,6 +1105,10 @@
(match file.file_swarmer with
| None -> None
| Some swarmer -> Some (CommonSwarming.chunks_verified_bitmap
swarmer));
+ P.file_chunk_size =
+ (match file.file_swarmer with
+ | None -> None
+ | Some t -> Some (List.map (fun t ->
t.CommonSwarming.t_chunk_size) t.CommonSwarming.t_s.CommonSwarming.s_networks));
P.file_availability =
[
network.network_num,
Index: src/networks/fileTP/fileTPInteractive.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/fileTP/fileTPInteractive.ml,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -b -r1.58 -r1.59
--- src/networks/fileTP/fileTPInteractive.ml 17 Jun 2007 01:56:30 -0000
1.58
+++ src/networks/fileTP/fileTPInteractive.ml 3 Aug 2007 22:11:46 -0000
1.59
@@ -97,6 +97,10 @@
| None -> None
| Some swarmer ->
Some (CommonSwarming.chunks_verified_bitmap swarmer));
+ P.file_chunk_size = (match file.file_swarmer with
+ | None -> None
+ | Some t ->
+ Some (List.map (fun t -> t.CommonSwarming.t_chunk_size)
t.CommonSwarming.t_s.CommonSwarming.s_networks));
P.file_availability =
[network.network_num,(match file.file_swarmer with
None -> "" | Some swarmer ->
Index: src/networks/gnutella/gnutellaInteractive.ml
===================================================================
RCS file:
/sources/mldonkey/mldonkey/src/networks/gnutella/gnutellaInteractive.ml,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -b -r1.72 -r1.73
--- src/networks/gnutella/gnutellaInteractive.ml 17 Jun 2007 01:56:30
-0000 1.72
+++ src/networks/gnutella/gnutellaInteractive.ml 3 Aug 2007 22:11:46
-0000 1.73
@@ -318,6 +318,10 @@
| None -> None
| Some swarmer ->
Some (CommonSwarming.chunks_verified_bitmap swarmer));
+ P.file_chunk_size = (match file.file_swarmer with
+ | None -> None
+ | Some t ->
+ Some (List.map (fun t -> t.CommonSwarming.t_chunk_size)
t.CommonSwarming.t_s.CommonSwarming.s_networks));
P.file_availability = [network.network_num,
(match file.file_swarmer with
None -> "" | Some swarmer ->
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co...,
mldonkey-commits <=