Changeset 10169

Timestamp:

Feb 11, 2010, 4:07:13 AM (13 years ago)

Author:

charles

Message:

(trunk libT) tweak the shutdown code

File:

• trunk/libtransmission/session.c (modified) (3 diffs)

trunk/libtransmission/session.c

@@ -1508 +1508 @@
 
 static int
-deadlineReached( const uint64_t deadline )
-{
-    return tr_date( ) >= deadline;
+deadlineReached( const time_t deadline )
+{
+    return time( NULL ) >= deadline;
 }
 
@@ -1518 +1518 @@
 tr_sessionClose( tr_session * session )
 {
-    const int      maxwait_msec = SHUTDOWN_MAX_SECONDS * 1000;
-    const uint64_t deadline = tr_date( ) + maxwait_msec;
+    const time_t deadline = time( NULL ) + SHUTDOWN_MAX_SECONDS;
 
     assert( tr_isSession( session ) );
@@ -1551 +1550 @@
         static tr_bool forced = FALSE;
         dbgmsg( "waiting for libtransmission thread to finish" );
-        tr_wait_msec( 100 );
+        tr_wait_msec( 500 );
         if( deadlineReached( deadline ) && !forced )
         {
             event_loopbreak( );
             forced = TRUE;
+
+            if( time( NULL ) >= deadline + 3 )
+                break;
         }
     }