export read bytes per second

cenkalti · Mar 5, 2019 · e51c51c · e51c51c
1 parent a6a3ea8
commit e51c51c
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 11 deletions.
diff --git a/internal/piececache/cache.go b/internal/piececache/cache.go
@@ -17,9 +17,10 @@ type Cache struct {
 	m             sync.RWMutex
 	sem           *semaphore.Semaphore
 
-	numCached metrics.EWMA
-	numTotal  metrics.EWMA
-	numLoad   metrics.EWMA
+	numCached   metrics.EWMA
+	numTotal    metrics.EWMA
+	numLoad     metrics.EWMA
+	loadedBytes metrics.EWMA
 
 	closeC chan struct{}
 }
@@ -28,14 +29,15 @@ type Loader func() ([]byte, error)
 
 func New(maxSize int64, ttl time.Duration, parallelReads uint) *Cache {
 	c := &Cache{
-		maxSize:   maxSize,
-		ttl:       ttl,
-		items:     make(map[string]*item),
-		sem:       semaphore.New(int(parallelReads)),
-		numCached: metrics.NewEWMA1(),
-		numTotal:  metrics.NewEWMA1(),
-		numLoad:   metrics.NewEWMA1(),
-		closeC:    make(chan struct{}),
+		maxSize:     maxSize,
+		ttl:         ttl,
+		items:       make(map[string]*item),
+		sem:         semaphore.New(int(parallelReads)),
+		numCached:   metrics.NewEWMA1(),
+		numTotal:    metrics.NewEWMA1(),
+		numLoad:     metrics.NewEWMA1(),
+		loadedBytes: metrics.NewEWMA1(),
+		closeC:      make(chan struct{}),
 	}
 	go c.tick()
 	return c
@@ -50,6 +52,7 @@ func (c *Cache) tick() {
 			c.numCached.Tick()
 			c.numTotal.Tick()
 			c.numLoad.Tick()
+			c.loadedBytes.Tick()
 		case <-c.closeC:
 			return
 		}
@@ -81,6 +84,10 @@ func (c *Cache) LoadsPerSecond() int {
 	return int(c.numLoad.Rate())
 }
 
+func (c *Cache) LoadedBytesPerSecond() int {
+	return int(c.loadedBytes.Rate())
+}
+
 func (c *Cache) LoadsWaiting() int {
 	return int(c.sem.Waiting())
 }
@@ -137,6 +144,7 @@ func (c *Cache) getValue(i *item, loader Loader) ([]byte, error) {
 	c.sem.Signal()
 	i.loaded = true
 	c.numLoad.Update(1)
+	c.loadedBytes.Update(int64(len(i.value)))
 
 	return c.handleNewItem(i)
 }

diff --git a/internal/rpctypes/rpctypes.go b/internal/rpctypes/rpctypes.go
@@ -44,6 +44,7 @@ type SessionStats struct {
 	PieceCacheUtilization         int
 	ReadsPerSecond                int
 	ReadsPending                  int
+	ReadBytesPerSecond            int
 	ActivePieceBytes              int64
 	TorrentsPendingRAM            int
 	Uptime                        int

diff --git a/torrent/rpchandler.go b/torrent/rpchandler.go
@@ -80,6 +80,7 @@ func (h *rpcHandler) GetSessionStats(args *rpctypes.GetSessionStatsRequest, repl
 		PieceCacheUtilization:         s.PieceCacheUtilization,
 		ReadsPerSecond:                s.ReadsPerSecond,
 		ReadsPending:                  s.ReadsPending,
+		ReadBytesPerSecond:            s.ReadBytesPerSecond,
 		ActivePieceBytes:              s.ActivePieceBytes,
 		TorrentsPendingRAM:            s.TorrentsPendingRAM,
 		Uptime:                        int(s.Uptime / time.Second),

diff --git a/torrent/session.go b/torrent/session.go
@@ -673,6 +673,7 @@ func (s *Session) Stats() SessionStats {
 		PieceCacheUtilization:         s.pieceCache.Utilization(),
 		ReadsPerSecond:                s.pieceCache.LoadsPerSecond(),
 		ReadsPending:                  s.pieceCache.LoadsWaiting(),
+		ReadBytesPerSecond:            s.pieceCache.LoadedBytesPerSecond(),
 		ActivePieceBytes:              ramStats.Used,
 		TorrentsPendingRAM:            ramStats.Count,
 		Uptime:                        time.Since(s.createdAt),

diff --git a/torrent/sessionstats.go b/torrent/sessionstats.go
@@ -12,6 +12,7 @@ type SessionStats struct {
 	PieceCacheUtilization         int
 	ReadsPerSecond                int
 	ReadsPending                  int
+	ReadBytesPerSecond            int
 	ActivePieceBytes              int64
 	TorrentsPendingRAM            int
 	Uptime                        time.Duration