Changeset 5597

Timestamp:

Apr 12, 2008, 3:56:21 PM (14 years ago)

Author:

charles

Message:

minor tr_torrentStat cleanup

Location:

trunk/libtransmission

Files:

• completion.c (modified) (1 diff)
• completion.h (modified) (1 diff)
• torrent.c (modified) (2 diffs)
• transmission.h (modified) (2 diffs)

trunk/libtransmission/completion.c

@@ -303 +303 @@
 }
 
+uint64_t
+tr_cpSizeWhenDone( const tr_completion * cp )
+{
+    tr_cpEnsureDoneValid( cp );
+
+    return cp->doneTotal;
+}
+
 cp_status_t
 tr_cpGetStatus ( const tr_completion * cp )

trunk/libtransmission/completion.h

@@ -41 +41 @@
 uint64_t         tr_cpLeftUntilComplete( const tr_completion * );
 uint64_t         tr_cpLeftUntilDone( const tr_completion * );
+uint64_t         tr_cpSizeWhenDone( const tr_completion * );
 float            tr_cpPercentComplete( const tr_completion * );
 float            tr_cpPercentDone( const tr_completion * );

trunk/libtransmission/torrent.c

@@ -614 +614 @@
     s->percentDone = tr_cpPercentDone( tor->completion );
     s->leftUntilDone = tr_cpLeftUntilDone( tor->completion );
+    s->sizeWhenDone = tr_cpSizeWhenDone( tor->completion );
 
     s->recheckProgress =
@@ -641 +642 @@
         tr_bitfield * peerPieces = tr_peerMgrGetAvailable( tor->handle->peerMgr,
                                                            tor->info.hash );
-        s->sizeWhenDone = 0;
         s->desiredAvailable = 0;
-
-        for( i=0; i<tor->info.pieceCount; ++i ) {
-            if( !tor->info.pieces[i].dnd ) {
-                s->sizeWhenDone += tor->info.pieceSize;
-                if( tr_bitfieldHas( peerPieces, i ) )
-                    s->desiredAvailable += tr_cpMissingBlocksInPiece( tor->completion, i );
-            }
-        }
-
+        for( i=0; i<tor->info.pieceCount; ++i )
+            if( !tor->info.pieces[i].dnd && tr_bitfieldHas( peerPieces, i ) )
+                s->desiredAvailable += tr_cpMissingBlocksInPiece( tor->completion, i );
         s->desiredAvailable *= tor->blockSize;
         tr_bitfieldFree( peerPieces );

trunk/libtransmission/transmission.h

@@ -877 +877 @@
     time_t manualAnnounceTime;
 
+    /* Byte count of all the piece data we'll have downloaded when we're done.
+     * whether or not we have it yet. [0...tr_info.totalSize] */
+    uint64_t sizeWhenDone;
+
     /* Byte count of how much data is left to be downloaded until
-     * we're done -- that is, until we've got all the pieces we wanted. */
+     * we're done -- that is, until we've got all the pieces we wanted.
+     * [0...tr_info.sizeWhenDone] */
     uint64_t leftUntilDone;
+
+    /* Byte count of all the piece data we want and don't have yet,
+     * but that a connected peer does have. [0...leftUntilDone] */
+    uint64_t desiredAvailable;
 
     /* Byte count of all the corrupt data you've ever downloaded for
@@ -901 +910 @@
      * moved to `corrupt' or `haveValid'. */
     uint64_t haveUnchecked;
-
-    /* Byte count of all the piece data we'll have downloaded when we're done.
-     * whether or not we have it yet. [0...tr_info.totalSize] */
-    uint64_t sizeWhenDone;
-
-    /* Byte count of all the piece data we want and don't have yet,
-     * but that a connected peer does have. [0...sizeWhenDone] */
-    uint64_t desiredAvailable;
 
     float swarmspeed;