[Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co...

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Branch:         
Changes by:     spiralvoice <address@hidden>    06/03/17 18:11:24

Modified files:
        distrib        : ChangeLog 
        src/daemon/common: commonShared.ml 

Log message:
        patch #4979

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/distrib/ChangeLog.diff?tr1=1.769&tr2=1.770&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/daemon/common/commonShared.ml.diff?tr1=1.29&tr2=1.30&r1=text&r2=text

Patches:
Index: mldonkey/distrib/ChangeLog
diff -u mldonkey/distrib/ChangeLog:1.769 mldonkey/distrib/ChangeLog:1.770
--- mldonkey/distrib/ChangeLog:1.769    Wed Mar 15 20:56:43 2006
+++ mldonkey/distrib/ChangeLog  Fri Mar 17 18:11:24 2006
@@ -14,6 +14,9 @@
 ChangeLog
 =========
 
+2006/03/17
+4979: Fix hashing large number of files
+
 2006/03/15
 4972: FileTP: Allow ftp:// downloads via dllink command
 4971: BT: Allow read-only access for shared files
Index: mldonkey/src/daemon/common/commonShared.ml
diff -u mldonkey/src/daemon/common/commonShared.ml:1.29 
mldonkey/src/daemon/common/commonShared.ml:1.30
--- mldonkey/src/daemon/common/commonShared.ml:1.29     Mon Feb  6 21:45:04 2006
+++ mldonkey/src/daemon/common/commonShared.ml  Fri Mar 17 18:11:24 2006
@@ -321,19 +321,20 @@
 (* TODO: We need to be able to unshare whole directories that still exist ! *)
   
 let shared_check_files () =
-  let list = ref [] in
-  (* check shared files, store removed files in !list *)
-  H.iter (fun s ->
+  if !waiting_directories = [] then begin
+    let list = ref [] in
+    (* check shared files, store removed files in !list *)
+    H.iter (fun s ->
       let name = shared_fullname s in
       if not (Unix32.file_exists name) then list := s :: !list
-  ) shareds_by_num;
-  (* unshare removed files *)
-  List.iter (fun s -> shared_unshare s) !list;
-  files_scanned_size := zero;
-  files_scanned := 0;
-  List.iter (fun s -> shared_add_directory s) 
-  !!CommonComplexOptions.shared_directories;
-  shared_calculate_total_bytes ()
+    ) shareds_by_num;
+    (* unshare removed files *)
+    List.iter shared_unshare !list;
+    files_scanned_size := zero;
+    files_scanned := 0;
+    List.iter shared_add_directory !!CommonComplexOptions.shared_directories;
+    shared_calculate_total_bytes ()
+  end
   
 let impl_shared_info impl =
   let module T = GuiTypes in