Changeset 7042

Timestamp:

Nov 4, 2008, 9:33:24 PM (12 years ago)

Author:

charles

Message:

(libT) #1417: revert r7039

Location:

trunk/libtransmission

Files:

• peer-io.c (modified) (3 diffs)
• peer-mgr.c (modified) (3 diffs)

trunk/libtransmission/peer-io.c

@@ -31 +31 @@
 #include "peer-io.h"
 #include "ratecontrol.h"
-#include "stats.h"  /* tr_statsAddUploaded(), tr_statsAddDownloaded() */
 #include "trevent.h"
 #include "utils.h"
@@ -183 +182 @@
         b->bytesUsed += n;
         tr_rcTransferred( io->speedometer[TR_UP], n );
-        tr_statsAddUploaded( io->session, n );
         dbgmsg( io,
                 "wrote %zu bytes to peer... upload bytesLeft is now %zu",
@@ -216 +214 @@
         b->bytesUsed += n;
         tr_rcTransferred( io->speedometer[TR_DOWN], n );
-        tr_statsAddDownloaded( io->session, n );
         dbgmsg( io,
                 "%zu new input bytes. bytesUsed is %zu, bytesLeft is %zu",

trunk/libtransmission/peer-mgr.c

@@ -32 +32 @@
 #include "peer-msgs.h"
 #include "ptrarray.h"
+#include "stats.h" /* tr_statsAddUploaded, tr_statsAddDownloaded */
 #include "torrent.h"
 #include "trevent.h"
@@ -1008 +1009 @@
             tor->activityDate = now;
             tor->uploadedCur += e->length;
+            tr_statsAddUploaded( tor->session, e->length );
             if( peer )
             {
@@ -1029 +1031 @@
             if( peer )
                 tor->downloadedCur += e->length;
+            tr_statsAddDownloaded( tor->session, e->length );
             if( peer ) {
                 struct peer_atom * a = getExistingAtom( t, &peer->in_addr );