Changeset 5682 for trunk/libtransmission/torrent.c

Timestamp:

Apr 24, 2008, 3:25:01 PM (14 years ago)

Author:

charles

Message:

#894: wont start - cp->doneHave <= cp->completeHave

File:

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

trunk/libtransmission/torrent.c

@@ -726 +726 @@
     tr_file_stat * walk = files;
 
-    for( i=0; i<n; ++i, ++walk )
-    {
-        const tr_file * file = tor->info.files + i;
-
-        walk->bytesCompleted = fileBytesCompleted( tor, i );
-
-        walk->progress = file->length
-            ? walk->bytesCompleted / (float)file->length
-            : 1.0;
+    for( i=0; i<n; ++i, ++walk ) {
+        const uint64_t b = fileBytesCompleted( tor, i );
+        walk->bytesCompleted = b;
+        walk->progress = tr_getRatio( b, tor->info.files[i].length );
     }
 
@@ -778 +773 @@
 }
 
-void tr_torrentAmountFinished( const tr_torrent * tor, float * tab, int size )
-{
-    int i;
-    float interval;
+void
+tr_torrentAmountFinished( const tr_torrent * tor, float * tab, int size )
+{
     tr_torrentLock( tor );
-
-    interval = (float)tor->info.pieceCount / (float)size;
-    for( i = 0; i < size; i++ )
-    {
-        int piece = i * interval;
-        tab[i] = tr_cpPercentBlocksInPiece( tor->completion, piece );
-    }
-
+    tr_cpGetAmountDone( tor->completion, tab, size );
     tr_torrentUnlock( tor );
 }