[Mldonkey-commits] mldonkey/src daemon/common/commonHasher.ml netw...

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Branch:         
Changes by:     spiralvoice <address@hidden>    06/03/18 18:35:54

Modified files:
        src/daemon/common: commonHasher.ml 
        src/networks/donkey: donkeyShare.ml 

Log message:
        patch #4985

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/daemon/common/commonHasher.ml.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/networks/donkey/donkeyShare.ml.diff?tr1=1.39&tr2=1.40&r1=text&r2=text

Patches:
Index: mldonkey/src/daemon/common/commonHasher.ml
diff -u mldonkey/src/daemon/common/commonHasher.ml:1.8 
mldonkey/src/daemon/common/commonHasher.ml:1.9
--- mldonkey/src/daemon/common/commonHasher.ml:1.8      Mon Feb  6 21:45:03 2006
+++ mldonkey/src/daemon/common/commonHasher.ml  Sat Mar 18 18:35:54 2006
@@ -45,10 +45,11 @@
         match !current_job with
         | None -> raise Not_found
         | Some (job, fd) ->
-(*            lprintf "job done\n";  *)
             if job_done job then begin
-                if !verbose_md4 then
-                  lprintf_nl "[cHa] Job finished";
+                if !verbose_md4 then lprintf_nl "[cHa] Finished %s job %s %Ld 
%Ld"
+                 (match job.job_method with
+                   MD5 -> "MD5" | TIGER -> "TIGER" | SHA1 -> "SHA1" | MD4 -> 
"MD4")
+                 job.job_name job.job_begin job.job_len;
                 current_job := None;
                 Unix.close fd;
                 (try job.job_handler job with e ->
@@ -69,10 +70,6 @@
           try
             let fd = Unix.openfile job.job_name [Unix.O_RDONLY] 0o444 in
             current_job := Some (job, fd);
-            if !verbose_md4 then lprintf_nl "[cHa] Starting %s job %s %Ld %Ld" 
-              (match job.job_method with
-               MD5 -> "MD5" | TIGER -> "TIGER" | SHA1 -> "SHA1" | MD4 -> "MD4")
-                  job.job_name job.job_begin job.job_len;
             job_start job fd;
           with e ->
               lprintf_nl "[cHa] Exception %s in starting job"
Index: mldonkey/src/networks/donkey/donkeyShare.ml
diff -u mldonkey/src/networks/donkey/donkeyShare.ml:1.39 
mldonkey/src/networks/donkey/donkeyShare.ml:1.40
--- mldonkey/src/networks/donkey/donkeyShare.ml:1.39    Fri Feb 17 22:24:41 2006
+++ mldonkey/src/networks/donkey/donkeyShare.ml Sat Mar 18 18:35:54 2006
@@ -219,7 +219,11 @@
             let end_pos = if end_pos > sh.shared_size then sh.shared_size
               else end_pos in
             let len = end_pos -- sh.shared_pos in
-            if !verbose_md4 then lprintf_nl () "compute next md4 of %s" 
sh.shared_name;
+            if !verbose_md4 then
+             lprintf_nl () "Hash chunk %Ld/%Ld of %s"
+               ((Int64.div sh.shared_pos block_size) ++ one)
+               ((Int64.div sh.shared_size block_size) ++ one)
+               sh.shared_name;
 
             M.compute_md4 (Unix32.filename sh.shared_fd) sh.shared_pos len
               (fun job ->
@@ -228,7 +232,6 @@
                     lprintf_nl () "Error prevent sharing %s" sh.shared_name
                   end else
                 let _ = () in
-               if !verbose_md4 then lprintf_nl () "computed md4 of %s" 
sh.shared_name;
                 let new_md4 = job.M.job_result in
 
                 sh.shared_list <- new_md4 :: sh.shared_list;