[Mldonkey-commits] mldonkey distrib/ChangeLog src/networks/bittorr...

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       10/03/20 13:36:54

Modified files:
        distrib        : ChangeLog 
        src/networks/bittorrent: bTClients.ml bTGlobals.ml 
                                 bTInteractive.ml bTTypes.ml 

Log message:
        patch #7128

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1407&r2=1.1408
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/bittorrent/bTClients.ml?cvsroot=mldonkey&r1=1.99&r2=1.100
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/bittorrent/bTGlobals.ml?cvsroot=mldonkey&r1=1.82&r2=1.83
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/bittorrent/bTInteractive.ml?cvsroot=mldonkey&r1=1.147&r2=1.148
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/bittorrent/bTTypes.ml?cvsroot=mldonkey&r1=1.45&r2=1.46

Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1407
retrieving revision 1.1408
diff -u -b -r1.1407 -r1.1408
--- distrib/ChangeLog   20 Mar 2010 13:32:44 -0000      1.1407
+++ distrib/ChangeLog   20 Mar 2010 13:36:54 -0000      1.1408
@@ -15,6 +15,7 @@
 =========
 
 2010/03/20
+7128: BT: Fix ratio reporting (ygrek)
 7127: Configure: Use Ocaml 3.11.2 as default compiler
 7076: Support preallocating files on Unix systems (drwho)
       Recent Linux kernels support fast preallocation when the filesystem is

Index: src/networks/bittorrent/bTClients.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/bittorrent/bTClients.ml,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -b -r1.99 -r1.100
--- src/networks/bittorrent/bTClients.ml        2 Jul 2008 07:49:07 -0000       
1.99
+++ src/networks/bittorrent/bTClients.ml        20 Mar 2010 13:36:54 -0000      
1.100
@@ -89,25 +89,32 @@
 *)
 let connect_trackers file event f =
 
-  let args,must_check_delay, downloaded, left =
+  (* reset session statistics when sending 'started' event *)
+  if event = "started" then
+  begin
+    file.file_session_uploaded <- Int64.zero;
+    file.file_session_downloaded <- Int64.zero;
+  end;
+
+  let args,must_check_delay, left =
 
     match file.file_swarmer with
       None ->
         begin
           match event with
-          | "started" -> [("event", "started")],true,zero,zero
-          | "stopped" -> [("event", "stopped")],false,zero,zero
-          | _ -> [],true, zero, zero
+          | "started" -> [("event", "started")],true,zero
+          | "stopped" -> [("event", "stopped")],false,zero
+          | _ -> [],true,zero
         end
 
     | Some swarmer ->
         let local_downloaded = CommonSwarming.downloaded swarmer in
         let left = file_size file -- local_downloaded in
         match event with
-        | "completed" -> [("event", "completed")],false,local_downloaded,zero
-        | "started" -> [("event", "started")],true,zero, left
-        | "stopped" -> [("event", "stopped")],false,zero, left
-        | _ -> [],true,local_downloaded, left
+        | "completed" -> [("event", "completed")],false,zero
+        | "started" -> [("event", "started")],true,left
+        | "stopped" -> [("event", "stopped")],false,left
+        | _ -> [],true,left
   in
 
   let args = ("no_peer_id", "1") :: ("compact", "1") :: args in
@@ -124,13 +131,12 @@
     ("info_hash", Sha1.direct_to_string file.file_id) ::
     ("peer_id", Sha1.direct_to_string !!client_uid) ::
     ("port", string_of_int !!client_port) ::
-    ("uploaded", Int64.to_string file.file_uploaded) ::
-    ("downloaded", Int64.to_string downloaded) ::
+    ("uploaded", Int64.to_string file.file_session_uploaded) ::
+    ("downloaded", Int64.to_string file.file_session_downloaded) ::
     ("left", Int64.to_string left) ::
     args
   in
   
-
   let enabled_trackers =
     let enabled_trackers = List.filter (fun t -> tracker_is_enabled t) 
file.file_trackers in
     if enabled_trackers <> [] then enabled_trackers
@@ -860,6 +866,8 @@
             count_download c (new_downloaded -- old_downloaded);
             (* use len here with max_dr quickfix *)
             Rate.update c.client_downloaded_rate ~amount:len;
+            (* count bytes downloaded from network for this file *)
+            file.file_session_downloaded <- file.file_session_downloaded ++ 
(Int64.of_int len);
             if !verbose_msg_clients then
               (match c.client_ranges_sent with
                   [] -> lprintf_file_nl (as_file file) "EMPTY Ranges !!!"
@@ -1531,6 +1539,7 @@
           Rate.update c.client_upload_rate  ~amount:len;
           Rate.update c.client_downloaded_rate;
           file.file_uploaded <- file.file_uploaded ++ (Int64.of_int len);
+          file.file_session_uploaded <- file.file_session_uploaded ++ 
(Int64.of_int len);
           let _ =
             (* update stats *)
             count_filerequest c;
@@ -1581,8 +1590,8 @@
 let file_resume file =
   List.iter (fun t ->
     match t.tracker_status with
-      Enabled -> ()
-    | _ -> t.tracker_status <- Enabled
+    | Enabled | Disabled_mld _ -> ()
+    | Disabled_failure _ | Disabled _ -> t.tracker_status <- Enabled
   ) file.file_trackers;
   (try get_sources_from_tracker file  with _ -> ())
 

Index: src/networks/bittorrent/bTGlobals.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/bittorrent/bTGlobals.ml,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -b -r1.82 -r1.83
--- src/networks/bittorrent/bTGlobals.ml        3 Aug 2007 22:12:58 -0000       
1.82
+++ src/networks/bittorrent/bTGlobals.ml        20 Mar 2010 13:36:54 -0000      
1.83
@@ -287,6 +287,8 @@
           file_torrent_diskname = torrent_diskname;
           file_completed_hook = (fun _ -> ());
           file_shared = None;
+          file_session_uploaded = Int64.zero;
+          file_session_downloaded = Int64.zero;
         } and file_impl =  {
           dummy_file_impl with
           impl_file_owner = user;

Index: src/networks/bittorrent/bTInteractive.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/bittorrent/bTInteractive.ml,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -b -r1.147 -r1.148
--- src/networks/bittorrent/bTInteractive.ml    31 Mar 2008 07:55:11 -0000      
1.147
+++ src/networks/bittorrent/bTInteractive.ml    20 Mar 2010 13:36:54 -0000      
1.148
@@ -1124,13 +1124,14 @@
       if CommonUserDb.user2_is_admin o.conn_user.ui_user then begin
       List.iter (fun file ->
           if file_state file = FileShared then
-              Printf.bprintf o.conn_buf "%s [%s]\n" file.file_name 
(Int64.to_string file.file_uploaded)
+              Printf.bprintf o.conn_buf "%s [U %Ld u/d %Ld/%Ld]\n" 
+                file.file_name file.file_uploaded file.file_session_uploaded 
file.file_session_downloaded
       ) !current_files;
       _s "done"
       end else
       begin print_command_result o "You are not allowed to use 
seeded_torrents";
       "" end
-    ), _s ":\t\t\tprint all seeded .torrent files on this server";
+    ), _s ":\t\t\tprint all seeded .torrent files on this server (output: 
name, total upload, session upload, session download)";
 
     "reshare_torrents", "Network/Bittorrent", Arg_none (fun o ->
       share_files ();

Index: src/networks/bittorrent/bTTypes.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/bittorrent/bTTypes.ml,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -b -r1.45 -r1.46
--- src/networks/bittorrent/bTTypes.ml  9 Jul 2007 23:50:54 -0000       1.45
+++ src/networks/bittorrent/bTTypes.ml  20 Mar 2010 13:36:54 -0000      1.46
@@ -315,6 +315,9 @@
     mutable file_tracker_connected : bool;
     mutable file_completed_hook : (file -> unit);
     mutable file_shared : file CommonShared.shared_impl option;
+    (** session uploaded and downloaded bytes, for statistics reporting *)
+    mutable file_session_uploaded : int64;
+    mutable file_session_downloaded : int64;
   }
 
 and ft = {