Changeset 3842

Timestamp:

Nov 16, 2007, 9:58:11 PM (15 years ago)

Author:

charles

Message:

progress on the "speed limits kill my transfer rate" bug.

Location:

trunk/libtransmission

Files:

• peer-io.c (modified) (1 diff)
• peer-msgs.c (modified) (14 diffs)
• ratecontrol.c (modified) (1 diff)

trunk/libtransmission/peer-io.c

@@ -30 +30 @@
 #define IO_TIMEOUT_SECS 8
 
-#define TR_RDBUF 2048
+/* arbitrary. */
+#define TR_RDBUF (1024*6)
 
 /**

trunk/libtransmission/peer-msgs.c

@@ -141 +141 @@
     time_t clientSentAnythingAt;
 
-    unsigned int notListening             : 1;
     unsigned int peerSupportsPex          : 1;
     unsigned int clientSentLtepHandshake  : 1;
@@ -875 +874 @@
 
 static int
-readBtLength( tr_peermsgs * msgs, struct evbuffer * inbuf )
+readBtLength( tr_peermsgs * msgs, struct evbuffer * inbuf, size_t inlen )
 {
     uint32_t len;
 
-    if( EVBUFFER_LENGTH(inbuf) < sizeof(len) )
+    if( inlen < sizeof(len) )
         return READ_MORE;
 
@@ -896 +895 @@
 
 static int
-readBtMessage( tr_peermsgs * msgs, struct evbuffer * inbuf );
+readBtMessage( tr_peermsgs * msgs, struct evbuffer * inbuf, size_t inlen );
 
 static int
-readBtId( tr_peermsgs * msgs, struct evbuffer * inbuf )
+readBtId( tr_peermsgs * msgs, struct evbuffer * inbuf, size_t inlen )
 {
     uint8_t id;
 
-    if( EVBUFFER_LENGTH(inbuf) < sizeof(uint8_t) )
+    if( inlen < sizeof(uint8_t) )
         return READ_MORE;
 
@@ -919 +918 @@
         return READ_AGAIN;
     }
-    else return readBtMessage( msgs, inbuf );
+    else return readBtMessage( msgs, inbuf, inlen-1 );
 }
 
@@ -1030 +1029 @@
 
 static int
-readBtPiece( tr_peermsgs * msgs, struct evbuffer * inbuf )
+readBtPiece( tr_peermsgs * msgs, struct evbuffer * inbuf, size_t inlen )
 {
     struct peer_request * req = &msgs->incoming.blockReq;
@@ -1037 +1036 @@
     if( !req->length )
     {
-        if( EVBUFFER_LENGTH( inbuf ) < 8 )
+        if( inlen < 8 )
             return READ_MORE;
 
@@ -1052 +1051 @@
         /* read in another chunk of data */
         const size_t nLeft = req->length - EVBUFFER_LENGTH(msgs->incoming.block);
-        size_t n = MIN( nLeft, EVBUFFER_LENGTH(inbuf) );
+        size_t n = MIN( nLeft, inlen );
         uint8_t * buf = tr_new( uint8_t, n );
         tr_peerIoReadBytes( msgs->io, inbuf, buf, n );
@@ -1080 +1079 @@
 
 static int
-readBtMessage( tr_peermsgs * msgs, struct evbuffer * inbuf )
+readBtMessage( tr_peermsgs * msgs, struct evbuffer * inbuf, size_t inlen )
 {
     uint32_t ui32;
@@ -1091 +1090 @@
     --msglen; // id length
 
-    if( EVBUFFER_LENGTH(inbuf) < msglen ) {
+    if( inlen < msglen ) {
         dbgmsg( msgs, " too short!!! " );
         return READ_MORE;
     }
 
-    dbgmsg( msgs, "got BT id %d, len %d, buffer size is %d", (int)id, (int)msglen, (int)EVBUFFER_LENGTH(inbuf) );
+    dbgmsg( msgs, "got BT id %d, len %d, buffer size is %d", (int)id, (int)msglen, (int)inlen );
 
     if( !messageLengthIsCorrect( msgs, id, msglen+1 ) )
@@ -1265 +1264 @@
 }
 
-static int
-canDownload( const tr_peermsgs * msgs )
-{
-    tr_torrent * tor = msgs->torrent;
+static size_t
+getDownloadMax( const tr_peermsgs * msgs )
+{
+    static const size_t maxval = ~0;
+    const tr_torrent * tor = msgs->torrent;
 
     if( tor->downloadLimitMode == TR_SPEEDLIMIT_GLOBAL )
-        return !tor->handle->useDownloadLimit || tr_rcCanTransfer( tor->handle->download );
+        return tor->handle->useDownloadLimit
+            ? tr_rcBytesLeft( tor->handle->download ) : maxval;
 
     if( tor->downloadLimitMode == TR_SPEEDLIMIT_SINGLE )
-        return tr_rcCanTransfer( tor->download );
-
-    return TRUE;
+        return tr_rcBytesLeft( tor->download );
+
+    return maxval;
 }
 
@@ -1407 +1408 @@
     tr_peermsgs * msgs = (tr_peermsgs *) vmsgs;
     struct evbuffer * inbuf = EVBUFFER_INPUT ( evin );
-
-dbgmsg( msgs, "canRead, state is %d", msgs->state );
-    if( !canDownload( msgs ) )
-    {
-dbgmsg( msgs, "oh, but canDownload failed" );
-        msgs->notListening = 1;
+    const size_t buflen = EVBUFFER_LENGTH( inbuf );
+    const size_t inlen = MIN( buflen, getDownloadMax( msgs ) );
+
+    if( !inlen )
+    {
         ret = READ_DONE;
     }
     else switch( msgs->state )
     {
-        case AWAITING_BT_LENGTH:  ret = readBtLength  ( msgs, inbuf ); break;
-        case AWAITING_BT_ID:      ret = readBtId      ( msgs, inbuf ); break;
-        case AWAITING_BT_MESSAGE: ret = readBtMessage ( msgs, inbuf ); break;
-        case AWAITING_BT_PIECE:   ret = readBtPiece   ( msgs, inbuf ); break;
+        case AWAITING_BT_LENGTH:  ret = readBtLength ( msgs, inbuf, inlen ); break;
+        case AWAITING_BT_ID:      ret = readBtId     ( msgs, inbuf, inlen ); break;
+        case AWAITING_BT_MESSAGE: ret = readBtMessage( msgs, inbuf, inlen ); break;
+        case AWAITING_BT_PIECE:   ret = readBtPiece  ( msgs, inbuf, inlen ); break;
         default: assert( 0 );
     }
@@ -1496 +1496 @@
     size_t len;
 
-    /* if we froze out a downloaded block because of speed limits,
-       start listening to the peer again */
-    if( msgs->notListening && canDownload( msgs ) )
-    {
-        msgs->notListening = 0;
-        tr_peerIoTryRead( msgs->io );
-    }
+    tr_peerIoTryRead( msgs->io );
 
     pumpRequestQueue( msgs );
@@ -1558 +1552 @@
 
     return TRUE; /* loop forever */
-}
-
-static void
-didWrite( struct bufferevent * evin UNUSED, void * vmsgs )
-{
-    pulse( vmsgs );
 }
 
@@ -1790 +1778 @@
     
     tr_peerIoSetTimeoutSecs( m->io, 150 ); /* timeout after N seconds of inactivity */
-    tr_peerIoSetIOFuncs( m->io, canRead, didWrite, gotError, m );
+    tr_peerIoSetIOFuncs( m->io, canRead, NULL, gotError, m );
     ratePulse( m );
 

trunk/libtransmission/ratecontrol.c

@@ -31 +31 @@
 
 #define GRANULARITY_MSEC 250
-#define SHORT_INTERVAL_MSEC 3000
-#define LONG_INTERVAL_MSEC 20000
+#define SHORT_INTERVAL_MSEC 2000
+#define LONG_INTERVAL_MSEC 10000
 #define HISTORY_SIZE (LONG_INTERVAL_MSEC / GRANULARITY_MSEC)