Changeset 3201

Timestamp:

Sep 27, 2007, 3:30:22 AM (15 years ago)

Author:

charles

Message:

round 2 of minor revisions to tr_stat

Location:

trunk/libtransmission

Files:

• torrent.c (modified) (1 diff)
• tracker.c (modified) (1 diff)
• transmission.h (modified) (1 diff)

trunk/libtransmission/torrent.c

@@ -815 +815 @@
         tr_bitfield * available = tr_peerMgrGetAvailable( tor->handle->peerMgr,
                                                           tor->info.hash );
-        s->nonDndSize = 0;
-        s->nonDndAvailable = 0;
+        s->desiredSize = 0;
+        s->desiredAvailable = 0;
 
         for( i=0; i<tor->info.pieceCount; ++i ) {
             if( !tor->info.pieces[i].dnd ) {
-                s->nonDndSize += tor->info.pieceSize;
+                s->desiredSize += tor->info.pieceSize;
                 if( tr_bitfieldHas( available, i ) )
-                    s->nonDndAvailable += tor->info.pieceSize;
+                    s->desiredAvailable += tor->info.pieceSize;
             }
         }

trunk/libtransmission/tracker.c

@@ -621 +621 @@
                         t->scrapeIntervalMsec = tmp->val.i * 1000;
 
-                assert( tr_ptrArrayFindSorted(t->scraping,tor,torrentCompare) );
+                assert( tr_ptrArrayFindSorted(t->scraping,tor,torrentCompare) ); /* FIXME This is the line that crashes for John_Clay */
                 tr_ptrArrayRemoveSorted( t->scraping, tor, torrentCompare );
 

trunk/libtransmission/transmission.h

@@ -674 +674 @@
 
     /* Byte count of all the non-DND piece data that either we already have,
-     * or that a peer we're connected to has. [0...tr_info.totalSize] */
-    uint64_t            nonDndAvailable;
-
-    /* Byte count of all the non-DND piece data */
-    uint64_t            nonDndSize;
+     * or that a peer we're connected to has. [0...desiredSize] */
+    uint64_t            desiredAvailable;
+
+    /* Byte count of all the piece data we want, whether we currently
+     * have it nor not. [0...tr_info.totalSize] */
+    uint64_t            desiredSize;
 
     float               swarmspeed;