Changeset 7147 for trunk/libtransmission/torrent.c

Timestamp:

Nov 24, 2008, 4:21:23 AM (14 years ago)

Author:

charles

Message:

(libT) #1468: another stab at getting the peer transfer speeds both fast and a little more consistent.

File:

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

trunk/libtransmission/torrent.c

@@ -33 +33 @@
 
 #include "transmission.h"
+#include "bandwidth.h"
 #include "bencode.h"
 #include "completion.h"
@@ -497 +498 @@
     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( );
+    tor->bandwidth[TR_UP] = tr_bandwidthNew( h );
+    tor->bandwidth[TR_DOWN] = tr_bandwidthNew( h );
 
     tor->blockSize = getBlockSize( info->pieceSize );
@@ -815 +814 @@
                             s->peersFrom );
 
-    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] );
+    s->rawUploadSpeed     = tr_bandwidthGetRawSpeed  ( tor->bandwidth[TR_UP] );
+    s->rawDownloadSpeed   = tr_bandwidthGetRawSpeed  ( tor->bandwidth[TR_DOWN] );
+    s->pieceUploadSpeed   = tr_bandwidthGetPieceSpeed( tor->bandwidth[TR_UP] );
+    s->pieceDownloadSpeed = tr_bandwidthGetPieceSpeed( tor->bandwidth[TR_DOWN] );
 
     usableSeeds += tor->info.webseedCount;
@@ -1101 +1100 @@
     h->torrentCount--;
 
-    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_bandwidthFree( tor->bandwidth[TR_DOWN] );
+    tr_bandwidthFree( tor->bandwidth[TR_UP] );
 
     tr_metainfoFree( inf );