Changeset 2377

Timestamp:

Jul 16, 2007, 7:57:34 PM (15 years ago)

Author:

charles

Message:

fix overlap bug in file-selection where files adjacent to a "do not download" file could end up missing a few bytes.

Location:

trunk/libtransmission

Files:

• fastresume.c (modified) (3 diffs)
• internal.h (modified) (2 diffs)
• torrent.c (modified) (7 diffs)

trunk/libtransmission/fastresume.c

@@ -234 +234 @@
 
 static int
-fastResumeLoadPriorities( tr_torrent_t * tor,
-                          FILE         * file )
+loadPriorities( tr_torrent_t * tor,
+                FILE         * file )
 {
     const size_t n = tor->info.fileCount;
     const size_t len = 2 * n;
+    int *dnd = NULL, dndCount = 0;
+    int *dl = NULL, dlCount = 0;
     char * buf = tr_new0( char, len );
     char * walk = buf;
@@ -262 +264 @@
 
     /* set the dnd flags */
-    for( i=0; i<n; ++i ) {
-        int j;
-        const char ch = *walk++;
-        tr_file_t * file = &tor->info.files[i];
-        file->dnd = ch == 't';
-        for( j=file->firstPiece; j<=file->lastPiece; ++j )
-            tor->info.pieces[j].dnd = file->dnd;
-    }
-
-    free( buf );
+    dl = tr_new( int, len );
+    dnd = tr_new( int, len );
+    for( i=0; i<n; ++i )
+        if( *walk++ == 't' ) /* 't' means the DND flag is true */
+            dnd[dndCount++] = i;
+        else
+            dl[dlCount++] = i;
+
+    if( dndCount )
+        tr_torrentSetFileDLs ( tor, dnd, dndCount, FALSE );
+    if( dlCount )
+        tr_torrentSetFileDLs ( tor, dl, dlCount, TRUE );
+
+    tr_free( dnd );
+    tr_free( dl );
+    tr_free( buf );
     return TR_OK;
 }
@@ -427 +435 @@
                 if( len == (uint32_t)(2 * tor->info.fileCount) )
                 {
-                    ret = fastResumeLoadPriorities( tor, file );
+                    ret = loadPriorities( tor, file );
 
                     if( ret && ( feof(file) || ferror(file) ) )

trunk/libtransmission/internal.h

@@ -205 +205 @@
     uint64_t          startDate;
     uint64_t          stopDate;
-    int               ioLoaded;
+    char              ioLoaded;
+    char              fastResumeDirty;
 
     int               peerCount;
@@ -218 +219 @@
     uint8_t           pexDisabled;
 
+    int8_t            statCur;
     tr_stat_t         stats[2];
-    int               statCur;
 
     tr_torrent_t    * next;

trunk/libtransmission/torrent.c

@@ -993 +993 @@
         /* sleep a little while */
         tr_wait( tor->runStatus == TR_RUN_STOPPED ? 1600 : 600 );
+
+        if( tor->fastResumeDirty ) {
+            tor->fastResumeDirty = FALSE;
+            fastResumeSave( tor );
+        }
 
         /* if we're stopping... */
@@ -1158 +1163 @@
 
 
-/***
-****
-****  File prioritization
-****
-***/
-
-static void
-tr_torrentSetFilePriorityImpl( tr_torrent_t   * tor,
-                               int              fileIndex,
-                               tr_priority_t    priority,
-                               int              doSave )
+/**
+***  File priorities
+**/
+
+void
+tr_torrentSetFilePriority( tr_torrent_t   * tor,
+                           int              fileIndex,
+                           tr_priority_t    priority )
 {
     int i;
@@ -1188 +1190 @@
              priority, tor->info.files[fileIndex].name );
 
-    if( doSave )
-        fastResumeSave( tor );
+    tor->fastResumeDirty = TRUE;
 
     tr_torrentWriterUnlock( tor );
-}
-
-void
-tr_torrentSetFilePriority( tr_torrent_t   * tor,
-                           int              fileIndex,
-                           tr_priority_t    priority )
-{
-    tr_torrentSetFilePriorityImpl( tor, fileIndex, priority, TRUE );
 }
 
@@ -1209 +1202 @@
 {
     int i;
-    for( i=0; i<fileCount; ++i ) {
-        const int fileIndex = files[i];
-        tr_torrentSetFilePriorityImpl( tor, fileIndex, priority, FALSE );
-    }
-    fastResumeSave( tor );
+    for( i=0; i<fileCount; ++i )
+        tr_torrentSetFilePriority( tor, files[i], priority );
 }
 
@@ -1246 +1236 @@
 }
 
+/**
+***  File DND
+**/
+
 int
 tr_torrentGetFileDL( const tr_torrent_t * tor,
                      int                  file )
 {
-    int do_download;
+    int doDownload;
     tr_torrentReaderLock( tor );
 
     assert( 0<=file && file<tor->info.fileCount );
-    do_download = !tor->info.files[file].dnd;
+    doDownload = !tor->info.files[file].dnd;
 
     tr_torrentReaderUnlock( tor );
-    return do_download != 0;
+    return doDownload != 0;
 }
 
@@ -1263 +1257 @@
 tr_torrentSetFileDL( tr_torrent_t  * tor,
                      int             fileIndex,
-                     int             do_download )
-{
+                     int             doDownload )
+{
+    const tr_file_t * file;
+    const int dnd = !doDownload;
+    int firstPiece, firstPieceDND;
+    int lastPiece, lastPieceDND;
     int i;
-    tr_file_t * file;
-    const int dnd = !do_download;
 
     tr_torrentWriterLock( tor );
 
-    assert( 0<=fileIndex && fileIndex<tor->info.fileCount );
     file = &tor->info.files[fileIndex];
-    file->dnd = dnd;
-    for( i=file->firstPiece; i<=file->lastPiece; ++i )
-      tor->info.pieces[i].dnd = dnd;
-    fastResumeSave( tor );
+    firstPiece = file->firstPiece;
+    lastPiece = file->lastPiece;
+
+    /* can't set the first piece to DND unless
+       every file using that piece is DND */
+    firstPieceDND = dnd;
+    for( i=fileIndex-1; firstPieceDND && i>=0; --i ) {
+        if( tor->info.files[i].lastPiece != firstPiece )
+            break;
+        firstPieceDND = tor->info.files[i].dnd;
+    }
+
+    /* can't set the last piece to DND unless
+       every file using that piece is DND */
+    lastPieceDND = dnd;
+    for( i=fileIndex+1; lastPieceDND && i<tor->info.fileCount; ++i ) {
+        if( tor->info.files[i].firstPiece != lastPiece )
+            break;
+        lastPieceDND = tor->info.files[i].dnd;
+    }
+
+    if( firstPiece == lastPiece )
+    {
+        tor->info.pieces[firstPiece].dnd = firstPieceDND && lastPieceDND;
+    }
+    else
+    {
+        tor->info.pieces[firstPiece].dnd = firstPieceDND;
+        tor->info.pieces[lastPiece].dnd = lastPieceDND;
+        for( i=firstPiece+1; i<lastPiece-1; ++i )
+            tor->info.pieces[i].dnd = dnd;
+    }
+
+    tor->fastResumeDirty = TRUE;
 
     tr_torrentWriterUnlock( tor );
@@ -1285 +1310 @@
                        int            * files,
                        int              fileCount,
-                       int              do_download )
-{
-    int i, j;
-    const int dnd = !do_download;
-
-    tr_torrentWriterLock( tor );
-
-    for( i=0; i<fileCount; ++i ) {
-        const int fileIndex = files[i];
-        tr_file_t * file = &tor->info.files[fileIndex];
-        file->dnd = dnd;
-        for( j=file->firstPiece; j<=file->lastPiece; ++j )
-            tor->info.pieces[j].dnd = dnd;
-    }
-
-    fastResumeSave( tor );
-
-    tr_torrentWriterUnlock( tor );
-}
+                       int              doDownload )
+{
+    int i;
+    for( i=0; i<fileCount; ++i )
+        tr_torrentSetFileDL( tor, files[i], doDownload );
+}