Drop support for go 1.20

[btrtrc.git] / conn_stats.go

diff --git a/conn_stats.go b/conn_stats.go
index 79554bc0d46518f5e0c8c4f4de5317e5f19e521d..0c5bfc784e88d4ce142cff68bb552e681cac9e1e 100644 (file)
--- a/conn_stats.go
+++ b/conn_stats.go
@@ -1,39 +1,42 @@
 package torrent
 
 import (
+       "encoding/json"
+       "fmt"
        "io"
-       "log"
        "reflect"
        "sync/atomic"
 
        pp "github.com/anacrolix/torrent/peer_protocol"
 )
 
-// Various connection-level metrics. At the Torrent level these are
-// aggregates. Chunks are messages with data payloads. Data is actual torrent
-// content without any overhead. Useful is something we needed locally.
-// Unwanted is something we didn't ask for (but may still be useful). Written
-// is things sent to the peer, and Read is stuff received from them.
+// Various connection-level metrics. At the Torrent level these are aggregates. Chunks are messages
+// with data payloads. Data is actual torrent content without any overhead. Useful is something we
+// needed locally. Unwanted is something we didn't ask for (but may still be useful). Written is
+// things sent to the peer, and Read is stuff received from them. Due to the implementation of
+// Count, must be aligned on some platforms: See https://github.com/anacrolix/torrent/issues/262.
 type ConnStats struct {
        // Total bytes on the wire. Includes handshakes and encryption.
        BytesWritten     Count
        BytesWrittenData Count
 
-       BytesRead           Count
-       BytesReadData       Count
-       BytesReadUsefulData Count
+       BytesRead                   Count
+       BytesReadData               Count
+       BytesReadUsefulData         Count
+       BytesReadUsefulIntendedData Count
 
        ChunksWritten Count
 
-       ChunksRead         Count
-       ChunksReadUseful   Count
-       ChunksReadUnwanted Count
+       ChunksRead       Count
+       ChunksReadUseful Count
+       ChunksReadWasted Count
+
+       MetadataChunksRead Count
 
        // Number of pieces data was written to, that subsequently passed verification.
        PiecesDirtiedGood Count
-       // Number of pieces data was written to, that subsequently failed
-       // verification. Note that a connection may not have been the sole dirtier
-       // of a piece.
+       // Number of pieces data was written to, that subsequently failed verification. Note that a
+       // connection may not have been the sole dirtier of a piece.
        PiecesDirtiedBad Count
 }
 
@@ -49,6 +52,8 @@ type Count struct {
        n int64
 }
 
+var _ fmt.Stringer = (*Count)(nil)
+
 func (me *Count) Add(n int64) {
        atomic.AddInt64(&me.n, n)
 }
@@ -57,6 +62,14 @@ func (me *Count) Int64() int64 {
        return atomic.LoadInt64(&me.n)
 }
 
+func (me *Count) String() string {
+       return fmt.Sprintf("%v", me.Int64())
+}
+
+func (me *Count) MarshalJSON() ([]byte, error) {
+       return json.Marshal(me.n)
+}
+
 func (cs *ConnStats) wroteMsg(msg *pp.Message) {
        // TODO: Track messages and not just chunks.
        switch msg.Type {
@@ -66,12 +79,9 @@ func (cs *ConnStats) wroteMsg(msg *pp.Message) {
        }
 }
 
-func (cs *ConnStats) readMsg(msg *pp.Message) {
-       switch msg.Type {
-       case pp.Piece:
-               cs.ChunksRead.Add(1)
-               cs.BytesReadData.Add(int64(len(msg.Piece)))
-       }
+func (cs *ConnStats) receivedChunk(size int64) {
+       cs.ChunksRead.Add(1)
+       cs.BytesReadData.Add(size)
 }
 
 func (cs *ConnStats) incrementPiecesDirtiedGood() {
@@ -91,7 +101,7 @@ func add(n int64, f func(*ConnStats) *Count) func(*ConnStats) {
 
 type connStatsReadWriter struct {
        rw io.ReadWriter
-       c  *connection
+       c  *PeerConn
 }
 
 func (me connStatsReadWriter) Write(b []byte) (n int, err error) {