Changeset 788

Timestamp:

Aug 16, 2006, 7:21:09 PM (16 years ago)

Author:

joshe

Message:

Try to keep track of the overall speed of the swarm.
Patch by Denis Ahrens.

Location:

trunk/libtransmission

Files:

• internal.h (modified) (1 diff)
• peerparse.h (modified) (1 diff)
• transmission.c (modified) (5 diffs)
• transmission.h (modified) (1 diff)

trunk/libtransmission/internal.h

@@ -128 +128 @@
     tr_ratecontrol_t * upload;
     tr_ratecontrol_t * download;
+    tr_ratecontrol_t * swarmspeed;
     tr_fd_t          * fdlimit;
 

trunk/libtransmission/peerparse.h

@@ -109 +109 @@
     tr_bitfieldAdd( peer->bitfield, piece );
     updateInterest( tor, peer );
+
+    tr_rcTransferred( tor->swarmspeed, tor->info.pieceSize );
 
     return 0;

trunk/libtransmission/transmission.c

@@ -283 +283 @@
     tor->upload         = tr_rcInit();
     tor->download       = tr_rcInit();
+    tor->swarmspeed     = tr_rcInit();
  
     /* We have a new torrent */
@@ -350 +351 @@
     tr_rcReset( tor->download );
     tr_rcReset( tor->upload );
+    tr_rcReset( tor->swarmspeed );
     tor->status = TR_STATUS_STOPPING;
     tor->stopDate = tr_date();
@@ -455 +457 @@
     s->progress = tr_cpCompletionAsFloat( tor->completion );
     if( tor->status & TR_STATUS_DOWNLOAD )
+    {
         s->rateDownload = tr_rcRate( tor->download );
+    }
     else
+    {
         /* tr_rcRate() doesn't make the difference between 'piece'
            messages and other messages, which causes a non-zero
@@ -462 +467 @@
            force it to zero not to confuse the user. */
         s->rateDownload = 0.0;
+    }
     s->rateUpload = tr_rcRate( tor->upload );
     
     s->seeders  = tr_trackerSeeders(tor->tracker);
-        s->leechers = tr_trackerLeechers(tor->tracker);
+    s->leechers = tr_trackerLeechers(tor->tracker);
+
+    s->swarmspeed = tr_rcRate( tor->swarmspeed );
 
     if( s->rateDownload < 0.1 )
@@ -589 +597 @@
     tr_rcClose( tor->upload );
     tr_rcClose( tor->download );
+    tr_rcClose( tor->swarmspeed );
 
     if( tor->destination )

trunk/libtransmission/transmission.h

@@ -322 +322 @@
     uint64_t            downloaded;
     uint64_t            uploaded;
+    float               swarmspeed;
 };