Changeset 12184 for trunk/libtransmission/announcer.c

Timestamp:

Mar 17, 2011, 6:51:31 PM (11 years ago)

Author:

jordan

Message:

(trunk libT) better shutdown management of libutp and UDP trackers in tr_sessionClose().

This is a little overlapping since the utp code can be closed more-or-less immediately, but the udp manager needs to stay open in order to process the udp tracker connection requests before sending out event=stopped. Moreover DNS resolver can be shut down after the UDP tracker is shutdown.

File:

• trunk/libtransmission/announcer.c (modified) (7 diffs)

trunk/libtransmission/announcer.c

@@ -125 +125 @@
     int slotsAvailable;
     int key;
-    time_t lpdUpkeepAt;
     time_t tauUpkeepAt;
 }
@@ -134 +133 @@
 {
     return announcer->slotsAvailable < 1;
-}
-
-static inline time_t
-jitterize( const int val )
-{
-    const double jitter = 0.1;
-    assert( val > 0 );
-    return val + tr_cryptoWeakRandInt((int)(1 + val * jitter));
 }
 
@@ -159 +150 @@
     a->session = session;
     a->slotsAvailable = MAX_CONCURRENT_TASKS;
-    a->lpdUpkeepAt = tr_time() + jitterize(5);
     a->upkeepTimer = evtimer_new( session->event_base, onUpkeepTimer, a );
     tr_timerAdd( a->upkeepTimer, UPKEEP_INTERVAL_SECS, 0 );
@@ -174 +164 @@
 
     flushCloseMessages( announcer );
+
+    tr_tracker_udp_start_shutdown( session );
 
     event_free( announcer->upkeepTimer );
@@ -1492 +1484 @@
 onUpkeepTimer( int foo UNUSED, short bar UNUSED, void * vannouncer )
 {
+    tr_announcer * announcer = vannouncer;
+    tr_session * session = announcer->session;
+    const tr_bool is_closing = session->isClosed;
     const time_t now = tr_time( );
-    tr_announcer * announcer = vannouncer;
-    tr_sessionLock( announcer->session );
+
+    tr_sessionLock( session );
 
     /* maybe send out some "stopped" messages for closed torrents */
@@ -1500 +1495 @@
 
     /* maybe send out some announcements to trackers */
-    announceMore( announcer );
+    if( !is_closing ) 
+        announceMore( announcer );
 
     /* TAU upkeep */
     if( announcer->tauUpkeepAt <= now ) {
         announcer->tauUpkeepAt = now + TAU_UPKEEP_INTERVAL_SECS;
-        tr_tracker_udp_upkeep( announcer->session );
+        tr_tracker_udp_upkeep( session );
     }
 
@@ -1511 +1507 @@
     tr_timerAdd( announcer->upkeepTimer, UPKEEP_INTERVAL_SECS, 0 );
 
-    tr_sessionUnlock( announcer->session );
+    tr_sessionUnlock( session );
 }