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

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       07/02/19 21:20:39

Modified files:
        distrib        : ChangeLog 
        src/daemon/common: commonOptions.ml 
        src/utils/net  : basicSocket.ml 

Log message:
        patch #5752

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1187&r2=1.1188
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/common/commonOptions.ml?cvsroot=mldonkey&r1=1.199&r2=1.200
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/utils/net/basicSocket.ml?cvsroot=mldonkey&r1=1.31&r2=1.32

Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1187
retrieving revision 1.1188
diff -u -b -r1.1187 -r1.1188
--- distrib/ChangeLog   19 Feb 2007 21:19:44 -0000      1.1187
+++ distrib/ChangeLog   19 Feb 2007 21:20:38 -0000      1.1188
@@ -15,6 +15,7 @@
 =========
 
 2007/02/19
+5752: Fix core hanging on ARM CPUs
 5750: EDK: New option upload_compression_ext_exclude (thx to pango)
 - space-separated list of file extensions which are not compressed when 
uploaded
 

Index: src/daemon/common/commonOptions.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/common/commonOptions.ml,v
retrieving revision 1.199
retrieving revision 1.200
diff -u -b -r1.199 -r1.200
--- src/daemon/common/commonOptions.ml  19 Feb 2007 21:19:44 -0000      1.199
+++ src/daemon/common/commonOptions.ml  19 Feb 2007 21:20:38 -0000      1.200
@@ -628,7 +628,7 @@
 let loop_delay = define_expert_option current_section ["loop_delay"]
   "The delay in milliseconds to wait in the event loop. Can be decreased to
   increase the bandwidth usage, or increased to lower the CPU usage."
-    int_option 20
+    int_option 5
 
 let nolimit_ips = define_option current_section ["nolimit_ips"]
   ~desc: "No-limit IPs"
@@ -1584,8 +1584,7 @@
 let options_version = define_expert_option current_section ["options_version"]
   ~internal: true
   "(internal option)"
-    int_option 14
-
+    int_option 15
 
 let max_comments_per_file = define_expert_option current_section 
["max_comments_per_file"]
   "Maximum number of comments per file"
@@ -2160,4 +2159,9 @@
       end;
       update 14
 
+  | 14 ->
+      (* set back to 5 because dynamic_loop_delay patch was removed *)
+      loop_delay =:= 5;
+      update 15
+
   | _ -> ()

Index: src/utils/net/basicSocket.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/utils/net/basicSocket.ml,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- src/utils/net/basicSocket.ml        21 Nov 2006 22:34:34 -0000      1.31
+++ src/utils/net/basicSocket.ml        19 Feb 2007 21:20:38 -0000      1.32
@@ -507,17 +507,10 @@
         lprintf_nl "[BW1] Resetting bandwidth counters";
       List.iter (fun f -> try f () with _ -> ()) !bandwidth_second_timers
   );
-  let loop_time = ref 0. in
   while true do
     try
-      let time = 
-       let new_time = update_time () in
-       let dynamic_loop_delay =  !loop_time +. !loop_delay -. new_time in
-        if dynamic_loop_delay > 0. then begin
-         (try select [] dynamic_loop_delay;  with _ -> ());
-         update_time ()
-       end else new_time in
-      loop_time := time;
+      if !loop_delay > 0. then (try select [] !loop_delay;  with _ -> ());
+      let _ = update_time () in
       exec_tasks !fd_tasks;
       exec_hooks !after_select_hooks;
       exec_timers !timers;