mirror/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission synced 2024-12-25 17:17:31 +00:00
Code Issues Releases Wiki Activity

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

Browse source
This commit is contained in:
Charles Kerr 2009-01-20 03:32:54 +00:00
parent 1375c707ed
commit 69404a8c36
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
libtransmission/peer-mgr.c
View file

@ -2031,8 +2031,8 @@ shouldPeerBeClosed( const Torrent * t,
/* if we have >= relaxIfFewerThan, strictness is 100%.
* 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;
const int limit = hi - ( ( hi - lo ) * strictness );
@ -2212,6 +2212,12 @@ reconnectPulse( void * vtorrent )
int i, nCandidates, nBad;
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 )
tordbg( t, "reconnect pulse for [%s]: %d bad connections, "
@ -2220,11 +2226,11 @@ reconnectPulse( void * vtorrent )
tr_ptrArraySize( &t->pool ),
(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 );
if( atom->piece_data_time )