[Mldonkey-commits] mldonkey distribChangeLog src/daemon/common/com...

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       06/06/06 22:31:18

Modified files:
        distrib        : ChangeLog 
        src/daemon/common: commonFile.ml commonFile.mli 
                           commonSwarming.ml 
        src/daemon/driver: driverInteractive.ml driverMain.ml 
        src/networks/bittorrent: bTInteractive.ml bTMain.ml 

Log message:
        patch #5159

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.871&r2=1.872
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/common/commonFile.ml?cvsroot=mldonkey&r1=1.53&r2=1.54
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/common/commonFile.mli?cvsroot=mldonkey&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/common/commonSwarming.ml?cvsroot=mldonkey&r1=1.36&r2=1.37
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/driver/driverInteractive.ml?cvsroot=mldonkey&r1=1.80&r2=1.81
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/driver/driverMain.ml?cvsroot=mldonkey&r1=1.111&r2=1.112
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/bittorrent/bTInteractive.ml?cvsroot=mldonkey&r1=1.94&r2=1.95
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/bittorrent/bTMain.ml?cvsroot=mldonkey&r1=1.21&r2=1.22

Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.871
retrieving revision 1.872
diff -u -b -r1.871 -r1.872
--- distrib/ChangeLog   6 Jun 2006 22:19:04 -0000       1.871
+++ distrib/ChangeLog   6 Jun 2006 22:31:18 -0000       1.872
@@ -15,6 +15,7 @@
 =========
 
 2006/06/07
+5159: Compute magic values only when needed
 5157: add some line breaks to option help text for shorter lines (schlumpf)
 
 2006/06/01

Index: src/daemon/common/commonFile.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/common/commonFile.ml,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -b -r1.53 -r1.54
--- src/daemon/common/commonFile.ml     30 May 2006 10:54:14 -0000      1.53
+++ src/daemon/common/commonFile.ml     6 Jun 2006 22:31:18 -0000       1.54
@@ -452,6 +452,18 @@
     None -> ()
   | Some magic -> (as_file_impl file).impl_file_magic <- Some (HashMagic.merge 
files_magic magic)
     
+let check_magic file =
+  let check file =
+    match Magic.M.magic_fileinfo (file_disk_name file) false with
+      None -> ()
+    | Some magic -> set_file_magic file (Some magic)
+  in
+  let magic = file_magic file in
+    match magic with
+      None -> check file
+    | Some magic when magic = "data" || magic = "empty" -> check file
+    | _ -> ()
+
 let set_file_last_seen file age =
   let impl = as_file_impl file in
   impl.impl_file_last_seen <- age

Index: src/daemon/common/commonFile.mli
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/common/commonFile.mli,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- src/daemon/common/commonFile.mli    12 May 2006 21:08:30 -0000      1.14
+++ src/daemon/common/commonFile.mli    6 Jun 2006 22:31:18 -0000       1.15
@@ -119,7 +119,7 @@
 val file_comment : CommonTypes.file -> string
 val file_magic : CommonTypes.file -> string option
 val set_file_magic : CommonTypes.file -> string option -> unit
-  
+val check_magic : CommonTypes.file -> unit  
 val recover_bytes : CommonTypes.file -> (int64 * int64) list
 val file_write : CommonTypes.file -> int64 -> string -> int -> int -> unit
 val file_verify : CommonTypes.file ->

Index: src/daemon/common/commonSwarming.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/common/commonSwarming.ml,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- src/daemon/common/commonSwarming.ml 31 May 2006 20:25:48 -0000      1.36
+++ src/daemon/common/commonSwarming.ml 6 Jun 2006 22:31:18 -0000       1.37
@@ -1247,6 +1247,7 @@
        print_s "VERIFIED" s
     end;
     t.t_verified t.t_nverified_chunks j in
+    if j = 0 && !Autoconf.magic_works then check_magic t.t_file;
   match t.t_converted_verified_bitmap.[j] with
   | '0' | '1' ->
       t.t_ncomplete_chunks <- t.t_ncomplete_chunks + 1;

Index: src/daemon/driver/driverInteractive.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/driver/driverInteractive.ml,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -b -r1.80 -r1.81
--- src/daemon/driver/driverInteractive.ml      30 May 2006 10:55:21 -0000      
1.80
+++ src/daemon/driver/driverInteractive.ml      6 Jun 2006 22:31:18 -0000       
1.81
@@ -123,23 +123,6 @@
     close_log ()
   end
 
-let file_magic_check () =
-  if !Autoconf.magic_works then begin
-    if !verbose then lprintf_nl "computing file magic values";
-    let check_magic file =
-      match Magic.M.magic_fileinfo (file_disk_name file) false with
-        None -> ()
-      | Some magic -> set_file_magic file (Some magic)
-    in
-    List.iter (fun file ->
-      let magic = file_magic file in
-      match magic with
-        None -> check_magic file
-      | Some magic when magic = "data" -> check_magic file
-      | _ -> ()
-    ) !!files
-  end
-
 (* ripped from gui_downloads *)
 
 let calc_file_eta f =

Index: src/daemon/driver/driverMain.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/driver/driverMain.ml,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -b -r1.111 -r1.112
--- src/daemon/driver/driverMain.ml     1 Jun 2006 01:41:11 -0000       1.111
+++ src/daemon/driver/driverMain.ml     6 Jun 2006 22:31:18 -0000       1.112
@@ -68,7 +68,6 @@
 
 let minute_timer () =
   DriverInteractive.hdd_check ();
-  DriverInteractive.file_magic_check ();
   CommonShared.shared_check_files ();
   CommonUploads.upload_credit_timer ();
   CommonInteractive.force_download_quotas ();
@@ -436,7 +435,6 @@
 
 (*  lprintf "(1) CommonComplexOptions.load\n"; *)
   CommonComplexOptions.load ();
-  DriverInteractive.file_magic_check ();
   CommonUploads.load ();
 
 (*  lprintf "(2) CommonComplexOptions.load done\n"; *)

Index: src/networks/bittorrent/bTInteractive.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/bittorrent/bTInteractive.ml,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -b -r1.94 -r1.95
--- src/networks/bittorrent/bTInteractive.ml    25 May 2006 19:47:25 -0000      
1.94
+++ src/networks/bittorrent/bTInteractive.ml    6 Jun 2006 22:31:18 -0000       
1.95
@@ -256,14 +256,24 @@
          end in
   print_first_tracker file.file_trackers;
 
+  let check_magic file =
+    match Magic.M.magic_fileinfo file false with
+      None -> None
+    | Some s -> Some (HashMagic.merge CommonGlobals.files_magic s)
+  in
   let cntr = ref 0 in
-  List.iter (fun (filename, size, magic) ->
+  List.iter (fun (filename, size, _) ->
     Printf.bprintf buf "\\</tr\\>\\<tr class=\\\"dl-%d\\\"\\>" (html_mods_cntr 
());
     let fs = Printf.sprintf "File %d" !cntr in
     let magic_string =
-      match magic with
+      if !Autoconf.magic_works then
+       begin
+          let subfile = Filename.concat (file_disk_name file) filename in
+          match check_magic subfile with
         None -> ""
       | Some magic -> Printf.sprintf " / %s" magic
+       end
+      else ""
     in
     html_mods_td buf [
       (fs, "sr br", fs);
@@ -623,32 +633,6 @@
           lprintf_nl "ft_retry: exception %s" (Printexc2.to_string e)
   ) ft_by_num
 
-let file_magic_check () =
-  if !Autoconf.magic_works then begin
-    if !verbose then lprintf_nl "computing sub_file magic values";
-    let check_magic file = 
-      match Magic.M.magic_fileinfo file false with
-        None -> None
-      | Some s -> Some (HashMagic.merge CommonGlobals.files_magic s)
-    in
-    Hashtbl.iter (fun _ file ->
-      let updated = ref false in
-      let new_file_files = ref [] in
-      List.iter (fun (filename, size, magic) ->
-        let subfile = Filename.concat (file_disk_name file) filename in
-        let new_magic =
-          match magic with
-            None -> check_magic subfile
-          | Some magic when magic = "data" || magic = "empty" -> check_magic 
subfile
-          | _ -> magic
-        in
-        if new_magic <> magic then updated := true;
-        new_file_files := (filename, size, new_magic) :: !new_file_files
-        ) file.file_files;
-        if !updated then file.file_files <- !new_file_files
-    ) files_by_uid
-  end
-
 let load_torrent_from_web r ft =
   if !verbose then
       lprintf_nl "Loading torrent from web";

Index: src/networks/bittorrent/bTMain.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/bittorrent/bTMain.ml,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- src/networks/bittorrent/bTMain.ml   19 May 2006 23:43:54 -0000      1.21
+++ src/networks/bittorrent/bTMain.ml   6 Jun 2006 22:31:18 -0000       1.22
@@ -115,7 +115,6 @@
     BTClients.recover_files ();
     add_session_timer enabler 60.0 (fun timer ->
         BTClients.recover_files ();
-        BTInteractive.file_magic_check ()
     );
 
     add_session_timer enabler 120.0 (fun timer ->
@@ -131,7 +130,6 @@
              ) !current_files;
   );
 
-  BTInteractive.file_magic_check ();
   BTClients.listen ();
   ()