[Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/driver/dr...

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       06/09/01 16:19:56

Modified files:
        distrib        : ChangeLog 
        src/daemon/driver: driverMain.ml 
        src/networks/donkey: donkeyGlobals.ml donkeyMain.ml 

Log message:
        patch #5355

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.981&r2=1.982
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/driver/driverMain.ml?cvsroot=mldonkey&r1=1.123&r2=1.124
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/donkey/donkeyGlobals.ml?cvsroot=mldonkey&r1=1.87&r2=1.88
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/donkey/donkeyMain.ml?cvsroot=mldonkey&r1=1.53&r2=1.54

Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.981
retrieving revision 1.982
diff -u -b -r1.981 -r1.982
--- distrib/ChangeLog   1 Sep 2006 16:18:53 -0000       1.981
+++ distrib/ChangeLog   1 Sep 2006 16:19:56 -0000       1.982
@@ -15,6 +15,7 @@
 =========
 
 2006/09/01
+5355: Move buffer_writes_delay timer from Donkey to Global module
 5344: Small code optimization for stderr warnings (thx to pango)
 
 2006/08/28

Index: src/daemon/driver/driverMain.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/driver/driverMain.ml,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -b -r1.123 -r1.124
--- src/daemon/driver/driverMain.ml     1 Sep 2006 16:18:53 -0000       1.123
+++ src/daemon/driver/driverMain.ml     1 Sep 2006 16:19:56 -0000       1.124
@@ -436,6 +436,7 @@
   add_infinite_timer 10. ten_second_timer;
   add_infinite_timer 3600. hourly_timer;
   add_infinite_timer 0.1 CommonUploads.upload_download_timer;
+  add_infinite_timer !!buffer_writes_delay (fun _ -> Unix32.flush ());
 
   if Autoconf.system = "mingw" then
     add_infinite_timer 1. (fun timer ->

Index: src/networks/donkey/donkeyGlobals.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/donkey/donkeyGlobals.ml,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -b -r1.87 -r1.88
--- src/networks/donkey/donkeyGlobals.ml        1 Sep 2006 16:18:53 -0000       
1.87
+++ src/networks/donkey/donkeyGlobals.ml        1 Sep 2006 16:19:56 -0000       
1.88
@@ -420,18 +420,6 @@
             let swarmer = CommonSwarming.create kernel (as_file file) 
block_size
             in
             file.file_swarmer <- Some swarmer;
-(*
-        CommonSwarming.set_writer swarmer (fun offset s pos len ->
-(*
-      lprintf "DOWNLOADED: %d/%d/%d\n" pos len (String.length s);
-      AnyEndian.dump_sub s pos len;
-*)
-
-            if !!CommonOptions.buffer_writes then
-              Unix32.buffered_write_copy t offset s pos len
-            else
-              Unix32.write  t offset s pos len
-        ); *)
             CommonSwarming.set_verifier swarmer
               (if md4s = [] then VerificationNotAvailable else
                 Verification (Array.of_list (List.map (fun md4 -> Ed2k md4) 
md4s))

Index: src/networks/donkey/donkeyMain.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/donkey/donkeyMain.ml,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -b -r1.53 -r1.54
--- src/networks/donkey/donkeyMain.ml   27 Jul 2006 21:46:51 -0000      1.53
+++ src/networks/donkey/donkeyMain.ml   1 Sep 2006 16:19:56 -0000       1.54
@@ -312,9 +312,6 @@
           DonkeyServers.udp_query_sources ()
          );
       
-      add_session_option_timer enabler buffer_writes_delay 
-        (fun _ -> Unix32.flush ());
-      
       add_session_option_timer enabler check_connections_delay 
         DonkeyServers.check_server_connections;