Changeset 8878

Timestamp:

Aug 7, 2009, 5:29:37 AM (13 years ago)

Author:

charles

Message:

(trunk libT) #2137: .resume file gets saved too frequently

Location:

trunk/libtransmission

Files:

• peer-mgr.c (modified) (3 diffs)
• resume.c (modified) (2 diffs)
• torrent.c (modified) (15 diffs)
• torrent.h (modified) (2 diffs)
• tracker.c (modified) (1 diff)
• verify.c (modified) (2 diffs)

trunk/libtransmission/peer-mgr.c

@@ -1026 +1026 @@
             tr_torrentSetActivityDate( tor, now );
 
-            if( e->wasPieceData )
+            if( e->wasPieceData ) {
                 tor->uploadedCur += e->length;
+                tr_torrentSetDirty( tor );
+            }
 
             /* update the stats */
@@ -1065 +1067 @@
              * to manage the swarms, not the web server and does not fit
              * into the jurisdiction of the tracker." */
-            if( peer && e->wasPieceData )
+            if( peer && e->wasPieceData ) {
                 tor->downloadedCur += e->length;
+                tr_torrentSetDirty( tor );
+            }
 
             /* update the stats */ 
@@ -1103 +1107 @@
 
             tr_cpBlockAdd( &tor->completion, block );
+            tr_torrentSetDirty( tor );
             decrementPieceRequests( t, e->pieceIndex );
 

trunk/libtransmission/resume.c

@@ -77 +77 @@
            const tr_torrent * tor )
 {
-    tr_pex * pex = NULL;
-    int count = tr_peerMgrGetPeers( (tr_torrent*) tor, &pex, TR_AF_INET );
-
+    int count;
+    tr_pex * pex;
+
+    count = tr_peerMgrGetPeers( (tr_torrent*) tor, &pex, TR_AF_INET );
     if( count > 0 )
         tr_bencDictAddRaw( dict, KEY_PEERS, pex, sizeof( tr_pex ) * count );
-
     tr_free( pex );
-    pex = NULL;
-    
+
     count = tr_peerMgrGetPeers( (tr_torrent*) tor, &pex, TR_AF_INET6 );
     if( count > 0 )
@@ -482 +481 @@
     char *  filename;
 
-    if( !tor )
+    if( !tr_isTorrent( tor ) )
         return;
+
+    tr_tordbg( tor, "Saving .resume file for \"%s\"", tor->info.name );
 
     tr_bencInitDict( &top, 32 ); /* arbitrary "big enough" number */

trunk/libtransmission/torrent.c

@@ -117 +117 @@
 
     tr_bandwidthSetDesiredSpeed( tor->bandwidth, dir, KiB_sec );
+
+    tr_torrentSetDirty( tor );
 }
 
@@ -135 +137 @@
 
     tr_bandwidthSetLimited( tor->bandwidth, dir, do_use );
+
+    tr_torrentSetDirty( tor );
 }
 
@@ -153 +157 @@
     tr_bandwidthHonorParentLimits( tor->bandwidth, TR_UP, doUse );
     tr_bandwidthHonorParentLimits( tor->bandwidth, TR_DOWN, doUse );
+
+    tr_torrentSetDirty( tor );
 }
 
@@ -175 +181 @@
     tor->ratioLimitMode = mode;
     tor->needsSeedRatioCheck = TRUE;
+
+    tr_torrentSetDirty( tor );
 }
 
@@ -193 +201 @@
 
     tor->needsSeedRatioCheck = TRUE;
+
+    tr_torrentSetDirty( tor );
 }
 
@@ -742 +752 @@
         tr_free( tor->downloadDir );
         tor->downloadDir = tr_strdup( path );
-        tr_torrentSaveResume( tor );
+        tr_torrentSetDirty( tor );
     }
 }
@@ -1160 +1170 @@
     tor->corruptCur      = 0;
 
+    tr_torrentSetDirty( tor );
+
     tr_torrentUnlock( tor );
 }
@@ -1247 +1259 @@
     tor->error = TR_STAT_OK;
     tor->errorString[0] = '\0';
+    tor->completeness = tr_cpGetStatus( &tor->completion );
+    tor->startDate = tor->anyDate = now;
     tr_torrentResetTransferStats( tor );
-    tor->completeness = tr_cpGetStatus( &tor->completion );
-    tr_torrentSaveResume( tor );
-    tor->startDate = tor->anyDate = now;
     tr_trackerStart( tor->tracker );
     tor->dhtAnnounceAt = now + tr_cryptoWeakRandInt( 20 );
@@ -1352 +1363 @@
 
     tr_fdTorrentClose( tor->uniqueId );
-}
-
-void
-tr_torrentStop( tr_torrent * tor )
-{
-    assert( tr_isTorrent( tor ) );
-
-    if( tr_isTorrent( tor ) )
-    {
-        tr_globalLock( tor->session );
-
-        tor->isRunning = 0;
+
+    if( tor->isDirty ) {
+        tor->isDirty = 0;
         if( !tor->isDeleting )
             tr_torrentSaveResume( tor );
+    }
+}
+
+void
+tr_torrentStop( tr_torrent * tor )
+{
+    assert( tr_isTorrent( tor ) );
+
+    if( tr_isTorrent( tor ) )
+    {
+        tr_globalLock( tor->session );
+
+        tor->isRunning = 0;
         tr_runInEventThread( tor->session, stopTorrent, tor );
 
@@ -1384 +1399 @@
     tr_bencDictAddInt( d, "date", time( NULL ) );
 
-    tr_torrentSaveResume( tor );
     tor->isRunning = 0;
     stopTorrent( tor );
@@ -1526 +1540 @@
         }
 
-        tr_torrentSaveResume( tor );
+        tr_torrentSetDirty( tor );
     }
 
@@ -1569 +1583 @@
         tr_torrentInitFilePriority( tor, files[i], priority );
 
-    tr_torrentSaveResume( tor );
+    tr_torrentSetDirty( tor );
     tr_torrentUnlock( tor );
 }
@@ -1713 +1727 @@
     tr_torrentLock( tor );
     tr_torrentInitFileDLs( tor, files, fileCount, doDownload );
-    tr_torrentSaveResume( tor );
+    tr_torrentSetDirty( tor );
     tr_torrentUnlock( tor );
 }
@@ -1736 +1750 @@
 
     tor->bandwidth->priority = priority;
+
+    tr_torrentSetDirty( tor );
 }
 
@@ -2004 +2020 @@
     tor->activityDate = t;
     tor->anyDate = MAX( tor->anyDate, tor->activityDate );
+    tr_torrentSetDirty( tor );
 }
 

trunk/libtransmission/torrent.h

@@ -205 +205 @@
     tr_bool                    needsSeedRatioCheck;
     tr_bool                    startAfterVerify;
+    tr_bool                    isDirty;
 
     uint16_t                   maxConnectedPeers;
@@ -326 +327 @@
 }
 
+/* set a flag indicating that the torrent's .resume file
+ * needs to be saved when the torrent is closed */
+static inline void tr_torrentSetDirty( tr_torrent * tor )
+{
+    assert( tr_isTorrent( tor ) );
+
+    tor->isDirty = TRUE;
+}
+
 #endif

trunk/libtransmission/tracker.c

@@ -554 +554 @@
         t->reannounceAt = now + interval;
         t->manualAnnounceAllowedAt = now + t->announceMinIntervalSec;
-
-        /* #319: save the .resume file after an announce so that, in case
-         * of a crash, our stats still match up with the tracker's stats */
-        tr_torrentSaveResume( tr_torrentFindFromHash( t->session, t->hash ) );
     }
     else if( 300 <= responseCode && responseCode <= 399 )

trunk/libtransmission/verify.c

@@ -24 +24 @@
 #include "completion.h"
 #include "fdlimit.h"
-#include "resume.h" /* tr_torrentSaveResume() */
 #include "inout.h"
 #include "list.h"
@@ -220 +219 @@
         {
             if( changed )
-                tr_torrentSaveResume( tor );
+                tr_torrentSetDirty( tor );
             fireCheckDone( tor, currentNode.verify_done_cb );
         }