Changeset 5650

Timestamp:

Apr 19, 2008, 7:37:05 PM (14 years ago)

Author:

charles

Message:

peer-msgs: faster upload speeds in situations with few peers. this patch needs wider testing for side-effects wrt speed limits.

Location:

trunk/libtransmission

Files:

• peer-mgr.c (modified) (3 diffs)
• peer-msgs.c (modified) (3 diffs)
• tracker.c (modified) (1 diff)

trunk/libtransmission/peer-mgr.c

@@ -995 +995 @@
 }
 
-static void
-maybeEnsureAtomExists( Torrent * t, const struct in_addr * addr, uint16_t port, uint8_t flags, uint8_t from )
-{
-    if( tr_blocklistHasAddress( t->manager->handle, addr ) )
-    {
-        char * fmt = NULL;
-        switch( from ) {
-            case TR_PEER_FROM_TRACKER:  fmt = _( "Banned IP address \"%s\" was given to us by the tracker" ); break;
-            case TR_PEER_FROM_CACHE:    fmt = _( "Banned IP address \"%s\" was found in the cache" ); break;
-            case TR_PEER_FROM_PEX:      fmt = _( "Banned IP address \"%s\" was given to us by another peer" ); break;
-            case TR_PEER_FROM_INCOMING: fmt = _( "Banned IP address \"%s\" tried to connect to us" ); break;
-        }
-        tr_torinf( t->tor, fmt, inet_ntoa( *addr ) );
-    }
-    else
-    {
-        ensureAtomExists( t, addr, port, flags, from );
-    }
-}
-
 static int
 getMaxPeerCount( const tr_torrent * tor UNUSED )
@@ -1120 +1100 @@
     if( tr_blocklistHasAddress( manager->handle, addr ) )
     {
-        tr_inf( _( "Banned IP address \"%s\" tried to connect to us" ),
+        tr_dbg( "Banned IP address \"%s\" tried to connect to us",
                 inet_ntoa( *addr ) );
         tr_netClose( socket );
@@ -1158 +1138 @@
 
     t = getExistingTorrent( manager, torrentHash );
-    maybeEnsureAtomExists( t, &pex->in_addr, pex->port, pex->flags, from );
+    if( !tr_blocklistHasAddress( t->manager->handle, &pex->in_addr ) )
+        ensureAtomExists( t, &pex->in_addr, pex->port, pex->flags, from );
 
     managerUnlock( manager );

trunk/libtransmission/peer-msgs.c

@@ -71 +71 @@
 
     MAX_QUEUE_SIZE          = (100),
-    MAX_OUTBUF_SIZE         = (1024),
      
     /* (fast peers) max number of pieces we fast-allow to another peer */
@@ -1601 +1600 @@
     const int useSwift = isSwiftEnabled( msgs );
     const size_t swiftLeft = msgs->info->credit;
-    size_t speedLeft;
-    size_t bufLeft;
+    int speedLeft;
+    int bufLeft;
     size_t ret;
 
@@ -1610 +1609 @@
         speedLeft = tr_rcBytesLeft( tor->upload );
     else
-        speedLeft = ~0;
-
-    bufLeft = MAX_OUTBUF_SIZE - tr_peerIoWriteBytesWaiting( msgs->io );
+        speedLeft = INT_MAX;
+
+    /* this basically says the outbuf shouldn't have more than one block
+     * queued up in it... blocksize, +13 for the size of the BT protocol's
+     * block message overhead */
+    bufLeft = tor->blockSize + 13 - tr_peerIoWriteBytesWaiting( msgs->io );
     ret = MIN( speedLeft, bufLeft );
     if( useSwift)

trunk/libtransmission/tracker.c

@@ -640 +640 @@
         const int interval = t->scrapeIntervalSec + t->randOffset;
         dbgmsg( t, "request succeeded. rescraping in %d seconds", interval );
+        tr_ndbg( t->name, "request succeeded. rescraping in %d seconds", interval );
         t->scrapeAt = time( NULL ) + interval;
     }