Changeset 7064

Timestamp:

Nov 7, 2008, 4:10:27 AM (12 years ago)

Author:

charles

Message:

#1429 (libT) cleaner handling of the special case where the upload or download speed limit is zero

Location:

trunk/libtransmission

Files:

• peer-mgr.c (modified) (4 diffs)
• peer-msgs.c (modified) (2 diffs)
• torrent.c (modified) (3 diffs)
• torrent.h (modified) (1 diff)

trunk/libtransmission/peer-mgr.c

@@ -1892 +1892 @@
     tr_peer **         peers = getConnectedPeers( t, &peerCount );
     struct ChokeData * choke = tr_new0( struct ChokeData, peerCount );
+    const int          chokeAll = !tr_torrentPieceTransferIsAllowed( t->tor, TR_CLIENT_TO_PEER );
 
     assert( torrentIsLocked( t ) );
@@ -1901 +1902 @@
         if( peer->progress >= 1.0 ) /* choke all seeds */
             tr_peerMsgsSetChoke( peer->msgs, TRUE );
-        else
-        {
+        else if( chokeAll )
+            tr_peerMsgsSetChoke( peer->msgs, TRUE );
+        else {
             struct ChokeData * n = &choke[size++];
             n->peer         = peer;
@@ -2504 +2506 @@
     for( i = 0; i < torrentCount; ++i )
     {
-        Torrent *    t = torrents[i];
+        Torrent * t = torrents[i];
         const size_t used = countPeerBandwidth( t->peers, direction );
+        tr_speedlimit speedMode;
+
         countHandshakeBandwidth( t->outgoingHandshakes, direction );
 
@@ -2514 +2518 @@
         allBytesUsed += used;
 
+        /* if piece data is disallowed, don't bother limiting bandwidth --
+         * we won't be asking for, or sending out, any pieces */
+        if( !tr_torrentPieceTransferIsAllowed( t->tor, direction ) )
+            speedMode = TR_SPEEDLIMIT_UNLIMITED;
+        else
+            speedMode = tr_torrentGetSpeedMode( t->tor, direction );
+            
         /* process the torrent's peers based on its speed mode */
-        switch( tr_torrentGetSpeedMode( t->tor, direction ) )
+        switch( speedMode )
         {
             case TR_SPEEDLIMIT_UNLIMITED:

trunk/libtransmission/peer-msgs.c

@@ -543 +543 @@
         return FALSE;
 
+    if( !tr_torrentPieceTransferIsAllowed( msgs->torrent, TR_PEER_TO_CLIENT ) )
+        return FALSE;
+
     torrent = msgs->torrent;
     bitfield = tr_cpPieceBitfield( torrent->completion );
@@ -810 +813 @@
         return;
     if( msgs->info->clientIsChoked )
+        return;
+    if( !tr_torrentPieceTransferIsAllowed( msgs->torrent, TR_PEER_TO_CLIENT ) )
         return;
 

trunk/libtransmission/torrent.c

@@ -147 +147 @@
 {
     tr_speedlimit * limit = direction == TR_UP ? &tor->uploadLimitMode
-                            : &tor->downloadLimitMode;
+                                               : &tor->downloadLimitMode;
 
     *limit = mode;
@@ -157 +157 @@
 {
     return direction == TR_UP ? tor->uploadLimitMode
-           : tor->downloadLimitMode;
+                              : tor->downloadLimitMode;
 }
 
@@ -193 +193 @@
             assert( 0 );
     }
+}
+
+int
+tr_torrentPieceTransferIsAllowed( const tr_torrent  * tor,
+                                  tr_direction        direction )
+{
+    int isEnabled = FALSE;
+
+    switch( tr_torrentGetSpeedMode( tor, direction ) )
+    {
+        case TR_SPEEDLIMIT_GLOBAL:
+            isEnabled = tr_sessionGetSpeedLimit( tor->session, direction ) > 0;
+            break;
+
+        case TR_SPEEDLIMIT_SINGLE:
+            isEnabled = tr_torrentGetSpeedLimit( tor, direction ) > 0;
+            break;
+
+        case TR_SPEEDLIMIT_UNLIMITED:
+            isEnabled = TRUE;
+            break;
+
+        default:
+            assert( 0 && "unhandled speed mode" );
+            break;
+    }
+
+    return isEnabled;
 }
 

trunk/libtransmission/torrent.h

@@ -82 +82 @@
 int         tr_torrentAllowsPex( const tr_torrent * );
 
+int         tr_torrentPieceTransferIsAllowed( const tr_torrent * torrent,
+                                              tr_direction       direction );
+
 /* get the index of this piece's first block */
 #define tr_torPieceFirstBlock( tor, piece ) ( ( piece ) *\