Changeset 7039

Timestamp:

Nov 4, 2008, 5:37:51 PM (12 years ago)

Author:

charles

Message:

(libT) #1417: overhead should be counted in the global stats

Location:

trunk/libtransmission

Files:

• peer-io.c (modified) (3 diffs)
• peer-mgr.c (modified) (3 diffs)
• stats.h (modified) (1 diff)

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"
@@ -182 +183 @@
         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",
@@ -214 +216 @@
         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_statsAddDownloaded */
 #include "torrent.h"
 #include "trevent.h"
@@ -1009 +1008 @@
             tor->activityDate = now;
             tor->uploadedCur += e->length;
-            tr_statsAddUploaded( tor->session, e->length );
             if( peer )
             {
@@ -1031 +1029 @@
             if( peer )
                 tor->downloadedCur += e->length;
-            tr_statsAddDownloaded( tor->session, e->length );
             if( peer ) {
                 struct peer_atom * a = getExistingAtom( t, &peer->in_addr );

trunk/libtransmission/stats.h

@@ -14 +14 @@
 #define TR_STATS_H
 
-void tr_statsInit( tr_handle * handle );
+void tr_statsInit           ( tr_session  * session );
 
-void tr_statsClose( tr_handle * handle );
+void tr_statsClose          ( tr_session  * session );
 
-void tr_statsAddUploaded( tr_handle * handle,
-                          uint32_t    bytes );
+void tr_statsAddUploaded    ( tr_session  * session,
+                              uint32_t      bytes );
 
-void tr_statsAddDownloaded( tr_handle * handle,
-                            uint32_t    bytes );
+void tr_statsAddDownloaded  ( tr_session  * session,
+                              uint32_t      bytes );
 
-void tr_statsFileCreated( tr_handle * handle );
+void tr_statsFileCreated    ( tr_session  * session );
 
 #endif