X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=api%2Fstats.go;h=d5665b77a7044b6f1a2177aca87430d95dedceb5;hb=4a4094e6cdc7f5d9e5a470ccf82df1c780c7e224;hp=e254eae45d99c9da1cefe6a1388e5e4887090376;hpb=bde85d422c7949ec32fb067e9c36320ccc47fb9e;p=govpp.git

diff --git a/api/stats.go b/api/stats.go
index e254eae..d5665b7 100644
--- a/api/stats.go
+++ b/api/stats.go
@@ -14,13 +14,25 @@
 
 package api
 
+// StatsProvider provides methods for retrieving statistics.
+type StatsProvider interface {
+	GetSystemStats(*SystemStats) error
+	GetNodeStats(*NodeStats) error
+	GetInterfaceStats(*InterfaceStats) error
+	GetErrorStats(*ErrorStats) error
+	GetBufferStats(*BufferStats) error
+	GetMemoryStats(*MemoryStats) error
+}
+
 // SystemStats represents global system statistics.
 type SystemStats struct {
-	VectorRate     float64
-	InputRate      float64
-	LastUpdate     float64
-	LastStatsClear float64
-	Heartbeat      float64
+	VectorRate          uint64
+	NumWorkerThreads    uint64
+	VectorRatePerWorker []uint64
+	InputRate           uint64
+	LastUpdate          uint64
+	LastStatsClear      uint64
+	Heartbeat           uint64
 }
 
 // NodeStats represents per node statistics.
@@ -49,19 +61,18 @@ type InterfaceCounters struct {
 	InterfaceIndex uint32
 	InterfaceName  string // requires VPP 19.04+
 
-	RxPackets uint64
-	RxBytes   uint64
-	RxErrors  uint64
-	TxPackets uint64
-	TxBytes   uint64
-	TxErrors  uint64
+	Rx InterfaceCounterCombined
+	Tx InterfaceCounterCombined
 
-	RxUnicast     [2]uint64 // packets[0], bytes[1]
-	RxMulticast   [2]uint64 // packets[0], bytes[1]
-	RxBroadcast   [2]uint64 // packets[0], bytes[1]
-	TxUnicastMiss [2]uint64 // packets[0], bytes[1]
-	TxMulticast   [2]uint64 // packets[0], bytes[1]
-	TxBroadcast   [2]uint64 // packets[0], bytes[1]
+	RxErrors uint64
+	TxErrors uint64
+
+	RxUnicast   InterfaceCounterCombined
+	RxMulticast InterfaceCounterCombined
+	RxBroadcast InterfaceCounterCombined
+	TxUnicast   InterfaceCounterCombined
+	TxMulticast InterfaceCounterCombined
+	TxBroadcast InterfaceCounterCombined
 
 	Drops   uint64
 	Punts   uint64
@@ -69,6 +80,13 @@ type InterfaceCounters struct {
 	IP6     uint64
 	RxNoBuf uint64
 	RxMiss  uint64
+	Mpls    uint64
+}
+
+// InterfaceCounterCombined defines combined counters for interfaces.
+type InterfaceCounterCombined struct {
+	Packets uint64
+	Bytes   uint64
 }
 
 // ErrorStats represents statistics per error counter.
@@ -79,7 +97,8 @@ type ErrorStats struct {
 // ErrorCounter represents error counter.
 type ErrorCounter struct {
 	CounterName string
-	Value       uint64
+
+	Values []uint64
 }
 
 // BufferStats represents statistics per buffer pool.
@@ -89,17 +108,32 @@ type BufferStats struct {
 
 // BufferPool represents buffer pool.
 type BufferPool struct {
-	PoolName  string
+	PoolName string
+
 	Cached    float64
 	Used      float64
 	Available float64
 }
 
-// StatsProvider provides the methods for getting statistics.
-type StatsProvider interface {
-	GetSystemStats() (*SystemStats, error)
-	GetNodeStats() (*NodeStats, error)
-	GetInterfaceStats() (*InterfaceStats, error)
-	GetErrorStats(names ...string) (*ErrorStats, error)
-	GetBufferStats() (*BufferStats, error)
+// MemoryStats represents memory stats segment counters.
+type MemoryStats struct {
+	// Deprecated: /mem/statseg total memory directory
+	Total float64
+	// Deprecated: /mem/statseg used memory directory
+	Used float64
+
+	// stat/main memory usage per-heap
+	Stat map[int]MemoryCounters
+	Main map[int]MemoryCounters
+}
+
+// MemoryCounters represents values of various memory usage
+type MemoryCounters struct {
+	Total      uint64
+	Used       uint64
+	Free       uint64
+	UsedMMap   uint64
+	TotalAlloc uint64
+	FreeChunks uint64
+	Releasable uint64
 }