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

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       10/09/07 18:25:50

Modified files:
        distrib        : ChangeLog 
        src/networks/direct_connect: dcShared.ml 

Log message:
        patch #7302

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1469&r2=1.1470
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/direct_connect/dcShared.ml?cvsroot=mldonkey&r1=1.5&r2=1.6

Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1469
retrieving revision 1.1470
diff -u -b -r1.1469 -r1.1470
--- distrib/ChangeLog   7 Sep 2010 18:24:39 -0000       1.1469
+++ distrib/ChangeLog   7 Sep 2010 18:25:50 -0000       1.1470
@@ -15,6 +15,7 @@
 =========
 
 2010/09/07
+7302: DC: Fix performance problem with many shared files (ygrek)
 7299: configure: abort on unknown options
 
 2010/09/01

Index: src/networks/direct_connect/dcShared.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/direct_connect/dcShared.ml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- src/networks/direct_connect/dcShared.ml     23 May 2010 09:12:15 -0000      
1.5
+++ src/networks/direct_connect/dcShared.ml     7 Sep 2010 18:25:50 -0000       
1.6
@@ -59,14 +59,14 @@
       if dirname = "" then ntabs else begin
         buf_tabs buf ntabs;
         let dir = dirname in
-        Printf.bprintf buf "%s\r\n" dir;
+        Printf.bprintf buf "%s\r\n" (DcProtocol.utf_to_dc dir);
         ntabs+1
       end
     in
     List.iter (fun dcsh ->
       buf_tabs buf ntabs;
       let fname = Filename2.basename dcsh.dc_shared_codedname in
-      Printf.bprintf buf "%s|%Ld\r\n" fname dcsh.dc_shared_size
+      Printf.bprintf buf "%s|%Ld\r\n" (DcProtocol.utf_to_dc fname) 
dcsh.dc_shared_size
     ) node.shared_files;
     List.iter (fun (_, node) ->
         iter ntabs node
@@ -134,7 +134,7 @@
 (* Compress string to Che3 and write to file *)
 let string_to_che3_to_file str filename =
   (try
-    let s = Che3.compress (DcProtocol.utf_to_dc str) in
+    let s = Che3.compress str in
     let wlen = 4096 in
     (*let str = String.create slen in*)
     let slen = String.length s in