Changeset 10387

Timestamp:

Mar 15, 2010, 11:29:56 PM (12 years ago)

Author:

charles

Message:

(trunk libT) #3051 "faster startup by adding 'have all' idiom to .resume files" -- implemented in trunk for 2.00

Location:

trunk/libtransmission

Files:

• completion.c (modified) (1 diff)
• completion.h (modified) (1 diff)
• resume.c (modified) (5 diffs)

trunk/libtransmission/completion.c

@@ -165 +165 @@
 }
 
+
+void
+tr_cpSetHaveAll( tr_completion * cp )
+{
+    tr_piece_index_t i;
+    tr_torrent * tor = cp->tor;
+
+    tr_cpReset( cp );
+
+    cp->sizeNow = tor->info.totalSize;
+    tr_bitfieldAddRange( &cp->blockBitfield, 0, tor->blockCount );
+    tr_bitfieldAddRange( &cp->pieceBitfield, 0, tor->info.pieceCount );
+    for( i=0; i<tor->info.pieceCount; ++i )
+        cp->completeBlocks[i] = tr_torPieceCountBlocks( tor, i );
+    cp->sizeWhenDoneIsDirty = 1;
+    cp->haveValidIsDirty = 1;
+}
+
 /* Initialize a completion object from a bitfield indicating which blocks we have */
 tr_bool

trunk/libtransmission/completion.h

@@ -158 +158 @@
                                  struct tr_bitfield * blocks );
 
+void      tr_cpSetHaveAll( tr_completion * completion );
+
 /***
 ****

trunk/libtransmission/resume.c

@@ -56 +56 @@
 #define KEY_RATIOLIMIT_MODE        "ratio-mode"
 
-#define KEY_PROGRESS_MTIMES   "mtimes"
-#define KEY_PROGRESS_BITFIELD "bitfield"
+#define KEY_PROGRESS_MTIMES    "mtimes"
+#define KEY_PROGRESS_BITFIELD  "bitfield"
+#define KEY_PROGRESS_HAVE      "have"
 
 enum
@@ -397 +398 @@
     }
 
-    /* add the bitfield */
+    /* add the progress */
+    if( tor->completeness == TR_SEED )
+        tr_bencDictAddStr( p, KEY_PROGRESS_HAVE, "all" );
     bitfield = tr_cpBlockBitfield( &tor->completion );
     tr_bencDictAddRaw( p, KEY_PROGRESS_BITFIELD,
@@ -415 +418 @@
     if( tr_bencDictFindDict( dict, KEY_PROGRESS, &p ) )
     {
+        const char * err;
+        const char * str;
         const uint8_t * raw;
         size_t          rawlen;
@@ -460 +465 @@
         }
 
-        if( tr_bencDictFindRaw( p, KEY_PROGRESS_BITFIELD, &raw, &rawlen ) )
+        err = NULL;
+        if( tr_bencDictFindStr( p, KEY_PROGRESS_HAVE, &str ) )
+        {
+            if( !strcmp( str, "all" ) )
+                tr_cpSetHaveAll( &tor->completion );
+            else
+                err = "Invalid value for HAVE";
+        }
+        else if( tr_bencDictFindRaw( p, KEY_PROGRESS_BITFIELD, &raw, &rawlen ) )
         {
             tr_bitfield tmp;
@@ -467 +480 @@
             tmp.bits = (uint8_t*) raw;
             if( !tr_cpBlockBitfieldSet( &tor->completion, &tmp ) )
-            {
-                tr_torrentUncheck( tor );
-                tr_tordbg(
-                    tor,
-                    "Torrent needs to be verified - error loading bitfield" );
-            }
-        }
-        else
-        {
+                err = "Error loading bitfield";
+        }
+        else err = "Couldn't find 'have' or 'bitfield'";
+        if( err != NULL )
+        { 
             tr_torrentUncheck( tor );
-            tr_tordbg(
-                tor,
-                "Torrent needs to be verified - unable to find bitfield" );
+            tr_tordbg( tor, "Torrent needs to be verified - %s", err );
         }