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

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       06/12/08 12:26:25

Modified files:
        distrib        : ChangeLog 
        src/daemon/common: commonOptions.ml 
        src/daemon/driver: driverCommands.ml driverMain.ml 

Log message:
        patch #5617

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1132&r2=1.1133
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/common/commonOptions.ml?cvsroot=mldonkey&r1=1.192&r2=1.193
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/driver/driverCommands.ml?cvsroot=mldonkey&r1=1.208&r2=1.209
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/driver/driverMain.ml?cvsroot=mldonkey&r1=1.133&r2=1.134

Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1132
retrieving revision 1.1133
diff -u -b -r1.1132 -r1.1133
--- distrib/ChangeLog   6 Dec 2006 22:33:04 -0000       1.1132
+++ distrib/ChangeLog   8 Dec 2006 12:26:24 -0000       1.1133
@@ -14,6 +14,13 @@
 ChangeLog
 =========
 
+2006/12/08
+5617: New option share_scan_interval
+- how often (in minutes) should MLDonkey scan all shared directories
+  for new/removed files, default one minute
+- on slow machines raise the interval to a higher value to reduce CPU load
+- to force a re-scan of shared directories use command "reshare"
+
 2006/12/06
 5613: Another longhelp cleanup (anhi)
 5615: EDK: Parse more fields from server.met files

Index: src/daemon/common/commonOptions.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/common/commonOptions.ml,v
retrieving revision 1.192
retrieving revision 1.193
diff -u -b -r1.192 -r1.193
--- src/daemon/common/commonOptions.ml  29 Nov 2006 20:36:37 -0000      1.192
+++ src/daemon/common/commonOptions.ml  8 Dec 2006 12:26:24 -0000       1.193
@@ -1267,6 +1267,10 @@
   "The directory where temporary files should be put"
     string_option "temp"
 
+let share_scan_interval = define_option current_section ["share_scan_interval"]
+  "How often (in minutes) should MLDonkey scan all shared directories for 
new/removed files"
+    int_option 1
+
 let create_file_mode = define_option current_section ["create_file_mode"]
   "New download files are created with these rights (in octal)"
     string_option "664"
@@ -1715,6 +1719,9 @@
   option_hook min_reask_delay (fun _ ->
     if !!min_reask_delay < 600 then min_reask_delay =:= 600
   );
+  option_hook share_scan_interval (fun _ ->
+    if !!share_scan_interval < 1 then share_scan_interval =:= 1
+  );
   option_hook global_login (fun _ ->
       let len = String.length !!global_login in
       let prefix = "mldonkey_" in

Index: src/daemon/driver/driverCommands.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/driver/driverCommands.ml,v
retrieving revision 1.208
retrieving revision 1.209
diff -u -b -r1.208 -r1.209
--- src/daemon/driver/driverCommands.ml 6 Dec 2006 22:33:04 -0000       1.208
+++ src/daemon/driver/driverCommands.ml 8 Dec 2006 12:26:24 -0000       1.209
@@ -1777,6 +1777,7 @@
                       [
                        strings_of_option previewer;
                        strings_of_option temp_directory;
+                       strings_of_option share_scan_interval;
                        strings_of_option hdd_temp_minfree;
                        strings_of_option hdd_temp_stop_core;
                        strings_of_option hdd_coredir_minfree;

Index: src/daemon/driver/driverMain.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/driver/driverMain.ml,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -b -r1.133 -r1.134
--- src/daemon/driver/driverMain.ml     28 Nov 2006 23:15:21 -0000      1.133
+++ src/daemon/driver/driverMain.ml     8 Dec 2006 12:26:25 -0000       1.134
@@ -54,7 +54,6 @@
 
 let minute_timer () =
   DriverInteractive.hdd_check ();
-  CommonShared.shared_check_files ();
   CommonUploads.upload_credit_timer ();
   CommonInteractive.force_download_quotas ();
   CommonResult.dummy_result.result_time <- last_time ();
@@ -446,6 +445,10 @@
   add_infinite_timer 0.1 CommonUploads.upload_download_timer;
   add_infinite_timer !!buffer_writes_delay (fun _ -> Unix32.flush ());
 
+  add_infinite_timer ((float_of_int !!share_scan_interval) *. 60.)
+    (fun _ -> CommonShared.shared_check_files ());
+  CommonShared.shared_check_files ();
+
   history_timeflag := (Unix.time()); 
   update_download_history (); 
   update_upload_history ();