Changeset 7137 for trunk/libtransmission/peer-io.c

Timestamp:

Nov 23, 2008, 4:31:28 PM (14 years ago)

Author:

charles

Message:

(libT) #1468: speed display is very jumpy

File:

• trunk/libtransmission/peer-io.c (modified) (9 diffs)

trunk/libtransmission/peer-io.c

@@ -31 +31 @@
 #include "net.h"
 #include "peer-io.h"
-#include "ratecontrol.h"
 #include "trevent.h"
 #include "utils.h"
@@ -73 +72 @@
 struct tr_bandwidth
 {
-    unsigned int    isUnlimited : 1;
-    size_t          bytesUsed;
-    size_t          bytesLeft;
+    unsigned int  isUnlimited : 1;
+    size_t        bytesLeft;
 };
 
@@ -221 +219 @@
                 struct tr_bandwidth * b = &io->bandwidth[TR_UP];
                 b->bytesLeft -= MIN( b->bytesLeft, n );
-                b->bytesUsed += n;
             }
 
@@ -257 +254 @@
         struct tr_bandwidth * b = io->bandwidth + TR_DOWN;
         b->bytesLeft -= MIN( b->bytesLeft, (size_t)n );
-        b->bytesUsed += n;
-        dbgmsg( io, "%zu new input bytes. bytesUsed is %zu, bytesLeft is %zu", n, b->bytesUsed, b->bytesLeft );
+        dbgmsg( io, "%zu new input bytes. bytesLeft is %zu", n, b->bytesLeft );
 
         adjustInputBuffer( io );
@@ -617 +613 @@
 
 size_t
-tr_peerIoGetBandwidthUsed( const tr_peerIo * io,
-                           tr_direction      direction )
-{
-    assert( io );
-    assert( direction == TR_UP || direction == TR_DOWN );
-    return io->bandwidth[direction].bytesUsed;
-}
-
-size_t
 tr_peerIoGetWriteBufferSpace( const tr_peerIo * io )
 {
@@ -650 +637 @@
 
 void
-tr_peerIoSetBandwidth( tr_peerIo *  io,
-                       tr_direction direction,
-                       size_t       bytesLeft )
+tr_peerIoAllocateBandwidth( tr_peerIo     * io,
+                            tr_direction    direction,
+                            size_t          bytesLeft )
 {
     struct tr_bandwidth * b;
@@ -661 +648 @@
     b = io->bandwidth + direction;
     b->isUnlimited = 0;
-    b->bytesUsed = 0;
     b->bytesLeft = bytesLeft;
 
@@ -679 +665 @@
     b = io->bandwidth + direction;
     b->isUnlimited = 1;
-    b->bytesUsed = 0;
     b->bytesLeft = 0;
 
@@ -883 +868 @@
     return time( NULL ) - io->timeCreated;
 }
-