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

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       07/08/22 23:44:55

Modified files:
        distrib        : ChangeLog 
        src/networks/bittorrent: bTMain.ml 

Log message:
        patch #6160

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1311&r2=1.1312
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/bittorrent/bTMain.ml?cvsroot=mldonkey&r1=1.27&r2=1.28

Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1311
retrieving revision 1.1312
diff -u -b -r1.1311 -r1.1312
--- distrib/ChangeLog   3 Aug 2007 22:30:19 -0000       1.1311
+++ distrib/ChangeLog   22 Aug 2007 23:44:55 -0000      1.1312
@@ -14,6 +14,12 @@
 ChangeLog
 =========
 
+2007/08/23
+6160: BT: Another fix for share_scan_interval
+- Old hard-coded default was 300s, now with share_scan_interval its
+  possible to use a minimum of 60s which produces high CPU load.
+  This patch implements a minimum of 300s for the BT share_files timer.
+
 2007/08/04
 6128: New default for option messages_filter (unease)
 6132: HTML: Fix group display in vd <num> for admin users

Index: src/networks/bittorrent/bTMain.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/bittorrent/bTMain.ml,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- src/networks/bittorrent/bTMain.ml   3 Aug 2007 22:07:54 -0000       1.27
+++ src/networks/bittorrent/bTMain.ml   22 Aug 2007 23:44:55 -0000      1.28
@@ -77,7 +77,7 @@
             lprintf "Exception in BTTracker.start_tracker: %s\n"
               (Printexc2.to_string e));
     if !!share_scan_interval <> 0 then
-    add_session_timer enabler ((float_of_int !!share_scan_interval) *. 60.)
+    add_session_timer enabler (float_of_int (max 300 (!!share_scan_interval * 
60)))
       (fun _ -> BTInteractive.share_files ();
     );
     if !!import_new_torrents_interval <> 0. then