Changeset 3711

Timestamp:

Nov 5, 2007, 5:42:26 AM (15 years ago)

Author:

charles

Message:

ensure that tr_close() exits gracefully even when the trackers aren't responding.

File:

• branches/0.9x/libtransmission/transmission.c (modified) (1 diff)

branches/0.9x/libtransmission/transmission.c

@@ -309 +309 @@
     h->isClosed = TRUE;
 }
+
+static int
+deadlineReached( const uint64_t deadline )
+{
+    return tr_date( ) >= deadline;
+}
+
 void
 tr_close( tr_handle * h )
 {
+    const int maxwait_msec = 6 * 1000;
+    const uint64_t deadline = tr_date( ) + maxwait_msec;
+
     tr_runInEventThread( h, tr_closeImpl, h );
-    while( !h->isClosed )
+    while( !h->isClosed && !deadlineReached( deadline ) )
         tr_wait( 100 );
 
     tr_eventClose( h );
-    while( h->events != NULL )
+    while( h->events && !deadlineReached( deadline ) )
         tr_wait( 100 );