Changeset 7761

Timestamp:

Jan 20, 2009, 3:32:54 AM (12 years ago)

Author:

charles

Message:

(trunk libT) when pruning out slow peers, don't prune if we don't have good candidates to replace them.

File:

• trunk/libtransmission/peer-mgr.c (modified) (3 diffs)

trunk/libtransmission/peer-mgr.c

@@ -2032 +2032 @@
          * if we have zero connections, strictness is 0% */
         const float strictness = peerCount >= relaxStrictnessIfFewerThanN
-            ? 1.0
-            : peerCount / (float)relaxStrictnessIfFewerThanN;
+                               ? 1.0
+                               : peerCount / (float)relaxStrictnessIfFewerThanN;
         const int lo = MIN_UPLOAD_IDLE_SECS;
         const int hi = MAX_UPLOAD_IDLE_SECS;
@@ -2213 +2213 @@
         struct peer_atom ** candidates = getPeerCandidates( t, &nCandidates );
         struct tr_peer ** connections = getPeersToClose( t, &nBad );
+        int maxCandidates;
+
+        maxCandidates = nCandidates;
+        maxCandidates = MAX( maxCandidates, MAX_RECONNECTIONS_PER_PULSE );
+        maxCandidates = MAX( maxCandidates, getMaxPeerCount( t->tor ) - getPeerCount( t ) );
+        maxCandidates = MAX( maxCandidates, MAX_CONNECTIONS_PER_SECOND - newConnectionsThisSecond );
 
         //if( nBad || nCandidates )
@@ -2221 +2227 @@
                     (int)MAX_RECONNECTIONS_PER_PULSE );
 
-        /* disconnect some peers.
+        /* disconnect some peers to make room for better ones.
            if we transferred piece data, then they might be good peers,
            so reset their `numFails' weight to zero.  otherwise we connected
            to them fruitlessly, so mark it as another fail */
-        for( i = 0; i < nBad; ++i ) {
+        for( i = 0; ( i < nBad ) && ( i < maxCandidates ) ; ++i ) {
             tr_peer * peer = connections[i];
             struct peer_atom * atom = getExistingAtom( t, &peer->addr );