Changeset 5979

Timestamp:

May 30, 2008, 5:22:26 PM (14 years ago)

Author:

charles

Message:

on shutdown, close the most active torrents first. That way if we can't get everyting closed in a reasonable amount of time, at least we get the ones that affect stats first.

Location:

trunk/libtransmission

Files:

• session.c (modified) (3 diffs)
• utils.c (modified) (1 diff)
• utils.h (modified) (1 diff)

trunk/libtransmission/session.c

@@ -398 +398 @@
 }
 
+/* close the biggest torrents first */
+static int
+compareTorrentByCur( const void * va, const void * vb )
+{
+    const tr_torrent * a = *(const tr_torrent**)va;
+    const tr_torrent * b = *(const tr_torrent**)vb;
+    return -tr_compareUint64( a->downloadedCur + a->uploadedCur,
+                              b->downloadedCur + b->uploadedCur );
+}
+
 static void
 tr_closeAllConnections( void * vh )
@@ -403 +413 @@
     tr_handle * h = vh;
     tr_torrent * tor;
+    int i, n;
+    tr_torrent ** torrents;
 
     tr_sharedShuttingDown( h->shared );
@@ -408 +420 @@
     tr_rpcClose( &h->rpcServer );
 
-    while(( tor = tr_torrentNext( h, NULL )))
-        tr_torrentFree( tor );
+    /* close the torrents.  get the most active ones first so that
+     * if we can't get them all closed in a reasonable amount of time,
+     * at least we get the most important ones first. */
+    tor = NULL;
+    n = h->torrentCount;
+    torrents = tr_new( tr_torrent*, h->torrentCount );
+    for( i=0; i<n; ++i )
+        torrents[i] = tr_torrentNext( h, tor );
+    qsort( torrents, n, sizeof(tr_torrent*), compareTorrentByCur );
+    for( i=0; i<n; ++i )
+        tr_torrentFree( torrents[i] );
+    tr_free( torrents );
 
     tr_peerMgrFree( h->peerMgr );

trunk/libtransmission/utils.c

@@ -355 +355 @@
 }
 
+int
+tr_compareUint64( uint64_t a, uint64_t b )
+{
+    if( a < b ) return -1;
+    if( a > b ) return 1;
+    return 0;
+}
+
 /**
 ***

trunk/libtransmission/utils.h

@@ -218 +218 @@
 int tr_compareUint16( uint16_t a, uint16_t b );
 int tr_compareUint32( uint32_t a, uint32_t b );
+int tr_compareUint64( uint64_t a, uint64_t b );
 
 void tr_sha1_to_hex( char * out, const uint8_t * sha1 );