[Pkg-ocaml-maint-commits] r2965 - /trunk/packages/mldonkey/trunk/debian/patches/arm_dynamic_loop_delay.dpatch

[smimram at users.alioth.debian.org]

Author: smimram
Date: Wed Jul 19 22:35:51 2006
New Revision: 2965

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=2965
Log:
Use arm.patch instead of arm277.patch.

Modified:
    trunk/packages/mldonkey/trunk/debian/patches/arm_dynamic_loop_delay.dpatch

Modified: trunk/packages/mldonkey/trunk/debian/patches/arm_dynamic_loop_delay.dpatch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/mldonkey/trunk/debian/patches/arm_dynamic_loop_delay.dpatch?rev=2965&op=diff
==============================================================================
--- trunk/packages/mldonkey/trunk/debian/patches/arm_dynamic_loop_delay.dpatch (original)
+++ trunk/packages/mldonkey/trunk/debian/patches/arm_dynamic_loop_delay.dpatch Wed Jul 19 22:35:51 2006
@@ -7,13 +7,24 @@
 @DPATCH@
 diff -urNad mldonkey-2.7.7~/src/utils/net/basicSocket.ml mldonkey-2.7.7/src/utils/net/basicSocket.ml
 --- mldonkey-2.7.7~/src/utils/net/basicSocket.ml	2006-05-17 08:52:44.000000000 +0000
-+++ mldonkey-2.7.7/src/utils/net/basicSocket.ml	2006-07-19 10:13:15.000000000 +0000
-@@ -519,7 +519,7 @@
-       let time = 
-  	let new_time = update_time () in
-  	let dynamic_loop_delay =  !loop_time +. !loop_delay -. new_time in
++++ mldonkey-2.7.7/src/utils/net/basicSocket.ml	2006-07-19 22:34:31.000000000 +0000
+@@ -513,17 +513,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
-+        if dynamic_loop_delay > 0.01 then begin
-  	  (try select [] dynamic_loop_delay;  with _ -> ());
-  	  update_time ()
-  	end else new_time in
+- 	  (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;