[Mldonkey-commits] mldonkey distrib/ChangeLog src/utils/net/tcpBuf...

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       10/07/28 16:24:13

Modified files:
        distrib        : ChangeLog 
        src/utils/net  : tcpBufferedSocket.ml 

Log message:
        patch #7254

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1450&r2=1.1451
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/utils/net/tcpBufferedSocket.ml?cvsroot=mldonkey&r1=1.47&r2=1.48

Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1450
retrieving revision 1.1451
diff -u -b -r1.1450 -r1.1451
--- distrib/ChangeLog   24 Jul 2010 16:45:06 -0000      1.1450
+++ distrib/ChangeLog   28 Jul 2010 16:24:13 -0000      1.1451
@@ -14,6 +14,10 @@
 ChangeLog
 =========
 
+2010/07/28
+7254: BT/bandwidth controllers: accept incoming connections while downloading
+- should improve upload when downlink is saturated (ygrek)
+
 2010/07/24
 7258: russian i18n mlnet_strings (Balamutick/ygrek)
 

Index: src/utils/net/tcpBufferedSocket.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/utils/net/tcpBufferedSocket.ml,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -b -r1.47 -r1.48
--- src/utils/net/tcpBufferedSocket.ml  25 Jul 2007 19:27:10 -0000      1.47
+++ src/utils/net/tcpBufferedSocket.ml  28 Jul 2010 16:24:13 -0000      1.48
@@ -908,7 +908,16 @@
   (match t.read_control with
       None -> ()
     | Some bc ->
-        must_read sock (bc.total_bytes = 0 || bc.remaining_bytes > 0));
+(*         must_read sock (bc.total_bytes = 0 || bc.remaining_bytes > 0)); *)
+        (* bandwidth_controler is called before socket is engaged into data 
transfer.
+           This can be either upload or download connection, but when download 
speed
+           is capped and fully saturated the above condition will be false,
+           consequently the socket will never get [want_read] property and
+           will never get considered by the event loop, until finally being 
+           closed on timeout. This bug manifests itself with no _new_ BT 
upload clients
+           or inability to connect to servers (DC) when download is running.
+           This is a temporary fix, bandwidth limiting logic needs some global 
refactoring *)
+        must_read sock true);
   (match t.write_control with
       None -> ()
     | Some bc ->