Changeset 2268

Timestamp:

Jul 1, 2007, 2:04:18 PM (15 years ago)

Author:

charles

Message:

Fix makemeta infinite loop reported by BentMyWookie?

File:

• trunk/libtransmission/makemeta.c (modified) (2 diffs)

trunk/libtransmission/makemeta.c

@@ -75 +75 @@
 
 static int
-bestPieceSize( uint64_t totalSize, int fileCount )
-{
-    const int minPieceSize = 65536; /* arbitrary; 2^16 */
-    const int maxPieceSize = 16777216; /* arbitrary; 2^24 */
-    const int desiredMinPiecesPerFile = 10; /* arbitrary */
-    const unsigned int desiredPieces = fileCount * desiredMinPiecesPerFile;
-
-    /* a good starting range is to have (1024..2048] pieces... */
-    int pieceSize = 1;
-    uint64_t log = totalSize;
-    while( log > 2048 ) {
-        log >>= 1;
-        pieceSize <<= 1;
-    }
-
-    /* now try to have N pieces per average file size...
-       this will reduce overhead on selective downloading
-       and increase swarm speed. */
-    while( ( totalSize / pieceSize ) < desiredPieces )
-        pieceSize >>= 1;
-
-    /* clamp to our desired range to make sure we
-       haven't gone too far astray... */
-    if( pieceSize < minPieceSize ) pieceSize = minPieceSize;
-    if( pieceSize > maxPieceSize ) pieceSize = maxPieceSize;
-
-    return pieceSize;
+bestPieceSize( uint64_t totalSize )
+{
+    static const uint64_t GiB = 1073741824;
+    static const uint64_t MiB = 1048576;
+    static const uint64_t KiB = 1024;
+
+    if( totalSize >= (8*GiB) )
+        return MiB;
+
+    if( totalSize <= (8*MiB) )
+        return 256 * KiB;
+
+    return 512 * KiB;
 }
 
@@ -161 +147 @@
            builderFileCompare );
 
-    ret->pieceSize = bestPieceSize( ret->totalSize, ret->fileCount );
+    ret->pieceSize = bestPieceSize( ret->totalSize );
     ret->pieceCount = ret->pieceSize
         ? (int)( ret->totalSize / ret->pieceSize)