mirror
/
transmission
mirror of https://github.com/transmission/transmission
1
0
Fork 0
Code Issues Releases Wiki Activity

fix some layout formatting

This commit is contained in:
Mitchell Livingston 2007-05-25 16:21:59 +00:00
parent 48bcc69675
commit 7b64d78751
1 changed files with 33 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
libtransmission/peerutils.h
View File

@ -59,66 +59,75 @@ static int peerCmp( tr_peer_t * peer1, tr_peer_t * peer2 )
static int checkPeer( tr_peer_t * peer ) static int checkPeer( tr_peer_t * peer )
{ {
tr_torrent_t * tor = peer->tor; tr_torrent_t * tor = peer->tor;
uint64_t now;
int ret; uint64_t now;
int peersWanted; int idleTime, peersWanted, percentOfRange;
int idleTime; int ret;
int sizeOfRange;
now = tr_date();
now = tr_date();
idleTime = now - peer->date; idleTime = now - peer->date;
if ( idleTime > MIN_CON_TIMEOUT ) /* get rid of clients with timeout less than 8 seconds and saves on a check later */
/* assume any peer over with an idleTime lower than
8 seconds has not timed out */
if ( idleTime > MIN_CON_TIMEOUT )
{ {
peersWanted = TR_MAX_PEER_COUNT * PERCENT_PEER_WANTED / 100; peersWanted = ( TR_MAX_PEER_COUNT * PERCENT_PEER_WANTED ) / 100;
if ( tor->peerCount > peersWanted ) if ( tor->peerCount > peersWanted )
{ {
/* strict requirements for connecting timeout */ /* strict requirements for connecting timeout */
if ( peer->status < PEER_STATUS_CONNECTED ) if ( peer->status < PEER_STATUS_CONNECTED )
{ {
peer_dbg( "connection timeout, idled %i seconds", (idleTime / 1000) ); peer_dbg( "connection timeout, idled %i seconds",
( idleTime / 1000 ) );
return TR_ERROR; return TR_ERROR;
} }
/* strict requirements for idle uploading timeout */ /* strict requirements for idle uploading timeout */
if ( peer->inRequestCount && idleTime > MIN_UPLOAD_IDLE ) if ( peer->inRequestCount && idleTime > MIN_UPLOAD_IDLE )
{ {
peer_dbg( "idle uploader timeout, idled %i seconds", (idleTime / 1000) ); peer_dbg( "idle uploader timeout, idled %i seconds",
( idleTime / 1000 ) );
return TR_ERROR; return TR_ERROR;
} }
/* strict requirements for keep-alive timeout */ /* strict requirements for keep-alive timeout */
if ( idleTime > MIN_KEEP_ALIVE ) if ( idleTime > MIN_KEEP_ALIVE )
{ {
peer_dbg( "peer timeout, idled %i seconds", (idleTime / 1000) ); peer_dbg( "peer timeout, idled %i seconds",
( idleTime / 1000 ) );
return TR_ERROR; return TR_ERROR;
} }
} }
else /* if we are tight for peers be more relaxed on enforcing timeouts, /* if we are tight for peers, relax the enforcement of timeouts */
basic equation min + ((max-min) / sizeOfRange) * tor->peerCount */ else
{ {
sizeOfRange = TR_MAX_PEER_COUNT - peersWanted; percentOfRange = tor->peerCount / (TR_MAX_PEER_COUNT - peersWanted);
/* relax requirements for connecting timeout */ /* relax requirements for connecting timeout */
if ( peer->status < PEER_STATUS_CONNECTED && idleTime > MIN_CON_TIMEOUT if ( peer->status < PEER_STATUS_CONNECTED && idleTime > MIN_CON_TIMEOUT +
+ (MAX_CON_TIMEOUT - MIN_CON_TIMEOUT) * tor->peerCount / sizeOfRange) ( MAX_CON_TIMEOUT - MIN_CON_TIMEOUT ) * percentOfRange )
{ {
peer_dbg( "connection timeout, idled %i seconds", (idleTime / 1000) ); peer_dbg( "connection timeout, idled %i seconds",
( idleTime / 1000 ) );
return TR_ERROR; return TR_ERROR;
} }
/* relax requirements for idle uploading timeout */ /* relax requirements for idle uploading timeout */
if ( peer->inRequestCount && idleTime > MIN_UPLOAD_IDLE if ( peer->inRequestCount && idleTime > MIN_UPLOAD_IDLE +
+ (MAX_UPLOAD_IDLE - MIN_UPLOAD_IDLE) * tor->peerCount / sizeOfRange) ( MAX_UPLOAD_IDLE - MIN_UPLOAD_IDLE ) * percentOfRange )
{ {
peer_dbg( "idle uploader timeout, idled %i seconds", (idleTime / 1000) ); peer_dbg( "idle uploader timeout, idled %i seconds",
( idleTime / 1000 ) );
return TR_ERROR; return TR_ERROR;
} }
/* relax requirements for keep-alive timeout */ /* relax requirements for keep-alive timeout */
if ( idleTime > MIN_KEEP_ALIVE + (MAX_KEEP_ALIVE - MIN_KEEP_ALIVE) * tor->peerCount / sizeOfRange) if ( idleTime > MIN_KEEP_ALIVE +
( MAX_KEEP_ALIVE - MIN_KEEP_ALIVE ) * percentOfRange )
{ {
peer_dbg( "peer timeout, idled %i seconds", (idleTime / 1000) ); peer_dbg( "peer timeout, idled %i seconds",
( idleTime / 1000 ) );
return TR_ERROR; return TR_ERROR;
} }
} }