mirror/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission synced 2024-12-26 01:27:28 +00:00
Code Issues Releases Wiki Activity

(trunk libT) heap and event pruning: don't create evtimers for periodic pex messages if the torrent doesn't allow pex (such as, if it's on a private tracker).

Browse source 
Previously, we unconditionally created the evtimer, and then checked each time to see if pex was allowed.
This commit is contained in:
Jordan Lee 2011-04-17 05:55:46 +00:00
parent 244bd7bc1c
commit 294c2d7113
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
libtransmission/peer-msgs.c
View file

@ -2309,6 +2309,7 @@ pexPulse( int foo UNUSED, short bar UNUSED, void * vmsgs )
sendPex( msgs ); sendPex( msgs );
assert( msgs->pexTimer != NULL );
tr_timerAdd( msgs->pexTimer, PEX_INTERVAL_SECS, 0 ); tr_timerAdd( msgs->pexTimer, PEX_INTERVAL_SECS, 0 );
} }
@ -2341,9 +2342,12 @@ tr_peerMsgsNew( struct tr_torrent * torrent,
m->outMessagesBatchedAt = 0; m->outMessagesBatchedAt = 0;
m->outMessagesBatchPeriod = LOW_PRIORITY_INTERVAL_SECS; m->outMessagesBatchPeriod = LOW_PRIORITY_INTERVAL_SECS;
m->incoming.block = evbuffer_new( ); m->incoming.block = evbuffer_new( );
m->pexTimer = evtimer_new( torrent->session->event_base, pexPulse, m );
peer->msgs = m; peer->msgs = m;
tr_timerAdd( m->pexTimer, PEX_INTERVAL_SECS, 0 );
if( tr_torrentAllowsPex( torrent ) ) {
m->pexTimer = evtimer_new( torrent->session->event_base, pexPulse, m );
tr_timerAdd( m->pexTimer, PEX_INTERVAL_SECS, 0 );
}
if( tr_peerIoSupportsUTP( peer->io ) ) { if( tr_peerIoSupportsUTP( peer->io ) ) {
const tr_address * addr = tr_peerIoGetAddress( peer->io, NULL ); const tr_address * addr = tr_peerIoGetAddress( peer->io, NULL );
@ -2376,7 +2380,8 @@ tr_peerMsgsFree( tr_peermsgs* msgs )
{ {
if( msgs ) if( msgs )
{ {
event_free( msgs->pexTimer ); if( msgs->pexTimer != NULL )
event_free( msgs->pexTimer );
evbuffer_free( msgs->incoming.block ); evbuffer_free( msgs->incoming.block );
evbuffer_free( msgs->outMessages ); evbuffer_free( msgs->outMessages );