Changeset 12366

Timestamp:

Apr 17, 2011, 5:55:46 AM (12 years ago)

Author:

jordan

Message:

(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).

Previously, we unconditionally created the evtimer, and then checked each time to see if pex was allowed.

File:

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

trunk/libtransmission/peer-msgs.c

@@ -2310 +2310 @@
     sendPex( msgs );
 
+    assert( msgs->pexTimer != NULL );
     tr_timerAdd( msgs->pexTimer, PEX_INTERVAL_SECS, 0 );
 }
@@ -2342 +2343 @@
     m->outMessagesBatchPeriod = LOW_PRIORITY_INTERVAL_SECS;
     m->incoming.block = evbuffer_new( );
-    m->pexTimer = evtimer_new( torrent->session->event_base, pexPulse, 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 ) ) {
@@ -2377 +2381 @@
     if( msgs )
     {
-        event_free( msgs->pexTimer );
+        if( msgs->pexTimer != NULL )
+            event_free( msgs->pexTimer );
 
         evbuffer_free( msgs->incoming.block );