Changeset 1064

Timestamp:

Nov 10, 2006, 4:21:46 AM (16 years ago)

Author:

titer

Message:

Adds progress in tr_peer_stat_t

Location:

trunk/libtransmission

Files:

• peer.c (modified) (2 diffs)
• peer.h (modified) (1 diff)
• peerparse.h (modified) (3 diffs)
• transmission.c (modified) (1 diff)
• transmission.h (modified) (1 diff)

trunk/libtransmission/peer.c

@@ -64 +64 @@
     /* The pieces that the peer has */
     uint8_t      * bitfield;
+    int            pieceCount;
+    float          progress;
 
     int            goodPcs;
@@ -536 +538 @@
 
 /***********************************************************************
+ * tr_peerIsDownloading
+ ***********************************************************************
+ *
+ **********************************************************************/
+float tr_peerProgress( tr_peer_t * peer )
+{
+    return peer->progress;
+}
+
+/***********************************************************************
  * tr_peerBitfield
  ***********************************************************************

trunk/libtransmission/peer.h

@@ -44 +44 @@
 int         tr_peerIsUploading   ( tr_peer_t * );
 int         tr_peerIsDownloading ( tr_peer_t * );
+float       tr_peerProgress      ( tr_peer_t * );
 uint8_t *   tr_peerBitfield      ( tr_peer_t * );
 float       tr_peerDownloadRate  ( tr_peer_t * );

trunk/libtransmission/peerparse.h

@@ -107 +107 @@
         peer->bitfield = calloc( ( tor->info.pieceCount + 7 ) / 8, 1 );
     }
+    if( !tr_bitfieldHas( peer->bitfield, piece ) )
+    {
+        peer->pieceCount++;
+        peer->progress = (float) peer->pieceCount / tor->info.pieceCount;
+    }
     tr_bitfieldAdd( peer->bitfield, piece );
     updateInterest( tor, peer );
@@ -120 +125 @@
     tr_info_t * inf = &tor->info;
     int bitfieldSize;
+    int i;
 
     bitfieldSize = ( inf->pieceCount + 7 ) / 8;
@@ -152 +158 @@
     }
     memcpy( peer->bitfield, p, bitfieldSize );
+
+    peer->pieceCount = 0;
+    for( i = 0; i < inf->pieceCount; i++ )
+    {
+        if( tr_bitfieldHas( peer->bitfield, i ) )
+        {
+            peer->pieceCount++;
+        }
+    }
+    peer->progress = (float) peer->pieceCount / inf->pieceCount;
+
     updateInterest( tor, peer );
 

trunk/libtransmission/transmission.c

@@ -592 +592 @@
             peers[i].isDownloading = tr_peerIsDownloading(peer);
             peers[i].isUploading = tr_peerIsUploading(peer);
+            peers[i].progress = tr_peerProgress(peer);
         }
     }

trunk/libtransmission/transmission.h

@@ -379 +379 @@
     int     isDownloading;
     int     isUploading;
+    float   progress;
 };