Changeset 7069 for trunk/libtransmission/torrent.c

Timestamp:

Nov 8, 2008, 2:49:04 AM (14 years ago)

Author:

charles

Message:

more fucking around with the speed measurements.

File:

• trunk/libtransmission/torrent.c (modified) (5 diffs)

trunk/libtransmission/torrent.c

@@ -497 +497 @@
     randomizeTiers( info );
 
+    tor->rawSpeed[TR_CLIENT_TO_PEER] = tr_rcInit( );
+    tor->rawSpeed[TR_PEER_TO_CLIENT] = tr_rcInit( );
     tor->pieceSpeed[TR_CLIENT_TO_PEER] = tr_rcInit( );
     tor->pieceSpeed[TR_PEER_TO_CLIENT] = tr_rcInit( );
@@ -745 +747 @@
 {
     return tor ? &tor->info : NULL;
-}
-
-static double
-tr_torrentGetRate( const tr_torrent * tor,
-                   tr_direction       direction )
-{
-    assert( tor != NULL );
-    assert( direction == TR_UP || direction == TR_DOWN );
-
-    return tr_rcRate( tor->pieceSpeed[direction] );
 }
 
@@ -823 +815 @@
                             s->peersFrom );
 
-    s->rateDownload = tr_torrentGetRate( tor, TR_PEER_TO_CLIENT );
-
-    s->rateUpload = tr_torrentGetRate( tor, TR_CLIENT_TO_PEER );
+    s->rawUploadSpeed     = tr_rcRate( tor->rawSpeed[TR_UP] );
+    s->rawDownloadSpeed   = tr_rcRate( tor->rawSpeed[TR_DOWN] );
+    s->pieceUploadSpeed   = tr_rcRate( tor->pieceSpeed[TR_UP] );
+    s->pieceDownloadSpeed = tr_rcRate( tor->pieceSpeed[TR_DOWN] );
 
     usableSeeds += tor->info.webseedCount;
@@ -881 +874 @@
     if( s->leftUntilDone > s->desiredAvailable )
         s->eta = TR_ETA_NOT_AVAIL;
-    else if( s->rateDownload < 0.1 )
+    else if( s->pieceDownloadSpeed < 0.1 )
         s->eta = TR_ETA_UNKNOWN;
     else
-        s->eta = s->leftUntilDone / s->rateDownload / 1024.0;
+        s->eta = s->leftUntilDone / s->pieceDownloadSpeed / 1024.0;
 
     s->ratio = tr_getRatio(
@@ -1110 +1103 @@
     tr_rcClose( tor->pieceSpeed[TR_PEER_TO_CLIENT] );
     tr_rcClose( tor->pieceSpeed[TR_CLIENT_TO_PEER] );
+    tr_rcClose( tor->rawSpeed[TR_PEER_TO_CLIENT] );
+    tr_rcClose( tor->rawSpeed[TR_CLIENT_TO_PEER] );
 
     tr_metainfoFree( inf );