Changeset 3201


Ignore:
Timestamp:
Sep 27, 2007, 3:30:22 AM (14 years ago)
Author:
charles
Message:

round 2 of minor revisions to tr_stat

Location:
trunk/libtransmission
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/libtransmission/torrent.c

    r3197 r3201  
    815815        tr_bitfield * available = tr_peerMgrGetAvailable( tor->handle->peerMgr,
    816816                                                          tor->info.hash );
    817         s->nonDndSize = 0;
    818         s->nonDndAvailable = 0;
     817        s->desiredSize = 0;
     818        s->desiredAvailable = 0;
    819819
    820820        for( i=0; i<tor->info.pieceCount; ++i ) {
    821821            if( !tor->info.pieces[i].dnd ) {
    822                 s->nonDndSize += tor->info.pieceSize;
     822                s->desiredSize += tor->info.pieceSize;
    823823                if( tr_bitfieldHas( available, i ) )
    824                     s->nonDndAvailable += tor->info.pieceSize;
     824                    s->desiredAvailable += tor->info.pieceSize;
    825825            }
    826826        }
  • trunk/libtransmission/tracker.c

    r3167 r3201  
    621621                        t->scrapeIntervalMsec = tmp->val.i * 1000;
    622622
    623                 assert( tr_ptrArrayFindSorted(t->scraping,tor,torrentCompare) );
     623                assert( tr_ptrArrayFindSorted(t->scraping,tor,torrentCompare) ); /* FIXME This is the line that crashes for John_Clay */
    624624                tr_ptrArrayRemoveSorted( t->scraping, tor, torrentCompare );
    625625
  • trunk/libtransmission/transmission.h

    r3197 r3201  
    674674
    675675    /* Byte count of all the non-DND piece data that either we already have,
    676      * or that a peer we're connected to has. [0...tr_info.totalSize] */
    677     uint64_t            nonDndAvailable;
    678 
    679     /* Byte count of all the non-DND piece data */
    680     uint64_t            nonDndSize;
     676     * or that a peer we're connected to has. [0...desiredSize] */
     677    uint64_t            desiredAvailable;
     678
     679    /* Byte count of all the piece data we want, whether we currently
     680     * have it nor not. [0...tr_info.totalSize] */
     681    uint64_t            desiredSize;
    681682
    682683    float               swarmspeed;
Note: See TracChangeset for help on using the changeset viewer.