Changeset 3872 for trunk/libtransmission/peer-msgs.c

Timestamp:

Nov 18, 2007, 4:24:17 AM (15 years ago)

Author:

charles

Message:

more download speed tweaks for situations where T is both uploading and downloading.

File:

• trunk/libtransmission/peer-msgs.c (modified) (5 diffs)

trunk/libtransmission/peer-msgs.c

@@ -1441 +1441 @@
 **/
 
-static int
-canWrite( const tr_peermsgs * msgs )
-{
-    /* don't let our outbuffer get too large */
-    return tr_peerIoWriteBytesWaiting( msgs->io ) < 4096;
-}
-
 static size_t
 getUploadMax( const tr_peermsgs * msgs )
@@ -1454 +1447 @@
     const tr_torrent * tor = msgs->torrent;
     const int useSwift = SWIFT_ENABLED && !tr_torrentIsSeed( msgs->torrent );
-    const size_t swiftBytes = msgs->info->credit;
-    size_t speedBytes;
-
-    if( !canWrite( msgs ) )
-        return 0;
+    const size_t swiftLeft = msgs->info->credit;
+    size_t speedLeft;
+    size_t bufLeft;
+    size_t ret;
 
     if( tor->uploadLimitMode == TR_SPEEDLIMIT_GLOBAL )
-        speedBytes = tor->handle->useUploadLimit ? tr_rcBytesLeft( tor->handle->upload ) : maxval;
+        speedLeft = tor->handle->useUploadLimit ? tr_rcBytesLeft( tor->handle->upload ) : maxval;
     else if( tor->uploadLimitMode == TR_SPEEDLIMIT_SINGLE )
-        speedBytes = tr_rcBytesLeft( tor->upload );
+        speedLeft = tr_rcBytesLeft( tor->upload );
     else
-        speedBytes = ~0;
-
-    return useSwift ? MIN( speedBytes, swiftBytes )
-                    : speedBytes;
+        speedLeft = ~0;
+
+    bufLeft = 4096 - tr_peerIoWriteBytesWaiting( msgs->io );
+    ret = MIN( speedLeft, bufLeft );
+    if( useSwift)
+        ret = MIN( ret, swiftLeft );
+    return ret;
 }
 
@@ -1526 +1521 @@
     tr_peermsgs * msgs = vmsgs;
     struct peer_request * r;
-    size_t len;
 
     tr_peerIoTryRead( msgs->io );
@@ -1540 +1534 @@
         assert( len );
 
-        if( outlen && canWrite( msgs ) )
+        if( outlen )
         {
             tr_peerIoWrite( msgs->io, EVBUFFER_DATA( msgs->outBlock ), outlen );
@@ -1552 +1546 @@
             dbgmsg( msgs, "wrote %d bytes; %d left in block", (int)outlen, (int)len );
         }
+        else dbgmsg( msgs, "stalled writing block... uploadMax %lu, outlen %lu", uploadMax, outlen );
     }
 
     if( !msgs->sendingBlock )
     {
-        if(( len = EVBUFFER_LENGTH( msgs->outMessages ) ))
+        if(( EVBUFFER_LENGTH( msgs->outMessages ) ))
         {
+            dbgmsg( msgs, "flushing outMessages..." );
             tr_peerIoWriteBuf( msgs->io, msgs->outMessages );
             msgs->clientSentAnythingAt = now;