X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=adapter%2Fstats_api.go;h=1319d71b9326b301e33c2c1fde36e5b8ec6c95b9;hb=b9aa34d5f77ac5969ad273bfd187ce5f9594b25e;hp=4b398f549d67d1384e11cc124719d27fb9562931;hpb=4e16c7100cc7f8dddca051ff393460d7a1a77c98;p=govpp.git

diff --git a/adapter/stats_api.go b/adapter/stats_api.go
index 4b398f5..1319d71 100644
--- a/adapter/stats_api.go
+++ b/adapter/stats_api.go
@@ -38,13 +38,15 @@ type StatsAPI interface {
 	// Disconnect terminates client connection.
 	Disconnect() error
 
-	// ListStats lists names for stats matching patterns.
-	ListStats(patterns ...string) (names []string, err error)
+	// ListStats lists indexed names for stats matching patterns.
+	ListStats(patterns ...string) (indexes []StatIdentifier, err error)
 	// DumpStats dumps all stat entries.
 	DumpStats(patterns ...string) (entries []StatEntry, err error)
 
 	// PrepareDir prepares new stat dir for entries that match any of prefixes.
 	PrepareDir(patterns ...string) (*StatDir, error)
+	// PrepareDirOnIndex prepares new stat dir for entries that match any of indexes.
+	PrepareDirOnIndex(indexes ...uint32) (*StatDir, error)
 	// UpdateDir updates stat dir and all of their entries.
 	UpdateDir(dir *StatDir) error
 }
@@ -60,6 +62,8 @@ const (
 	CombinedCounterVector StatType = 3
 	ErrorIndex            StatType = 4
 	NameVector            StatType = 5
+	Empty                 StatType = 6
+	Symlink               StatType = 7
 )
 
 func (d StatType) String() string {
@@ -74,6 +78,10 @@ func (d StatType) String() string {
 		return "ErrorIndex"
 	case NameVector:
 		return "NameVector"
+	case Empty:
+		return "Empty"
+	case Symlink:
+		return "Symlink"
 	}
 	return fmt.Sprintf("UnknownStatType(%d)", d)
 }
@@ -81,16 +89,22 @@ func (d StatType) String() string {
 // StatDir defines directory of stats entries created by PrepareDir.
 type StatDir struct {
 	Epoch   int64
-	Indexes []uint32
 	Entries []StatEntry
 }
 
+// StatIdentifier holds a stat entry name and index
+type StatIdentifier struct {
+	Index uint32
+	Name  []byte
+}
+
 // StatEntry represents single stat entry. The type of stat stored in Data
 // is defined by Type.
 type StatEntry struct {
-	Name []byte
-	Type StatType
-	Data Stat
+	StatIdentifier
+	Type    StatType
+	Data    Stat
+	Symlink bool
 }
 
 // Counter represents simple counter with single value, which is usually packet count.
@@ -100,11 +114,11 @@ type Counter uint64
 type CombinedCounter [2]uint64
 
 func (s CombinedCounter) Packets() uint64 {
-	return uint64(s[0])
+	return s[0]
 }
 
 func (s CombinedCounter) Bytes() uint64 {
-	return uint64(s[1])
+	return s[1]
 }
 
 // Name represents string value stored under name vector.
@@ -119,6 +133,9 @@ type Stat interface {
 	// IsZero returns true if all of its values equal to zero.
 	IsZero() bool
 
+	// Type returns underlying type of a stat
+	Type() StatType
+
 	// isStat is intentionally  unexported to limit implementations of interface to this package,
 	isStat()
 }
@@ -129,13 +146,13 @@ type ScalarStat float64
 // ErrorStat represents stat for ErrorIndex. The array represents workers.
 type ErrorStat []Counter
 
-// SimpleCounterStat represents stat for SimpleCounterVector.
+// SimpleCounterStat represents indexed stat for SimpleCounterVector.
 // The outer array represents workers and the inner array represents interface/node/.. indexes.
 // Values should be aggregated per interface/node for every worker.
 // ReduceSimpleCounterStatIndex can be used to reduce specific index.
 type SimpleCounterStat [][]Counter
 
-// CombinedCounterStat represents stat for CombinedCounterVector.
+// CombinedCounterStat represents indexed stat for CombinedCounterVector.
 // The outer array represents workers and the inner array represents interface/node/.. indexes.
 // Values should be aggregated per interface/node for every worker.
 // ReduceCombinedCounterStatIndex can be used to reduce specific index.
@@ -144,15 +161,24 @@ type CombinedCounterStat [][]CombinedCounter
 // NameStat represents stat for NameVector.
 type NameStat []Name
 
+// EmptyStat represents removed counter directory
+type EmptyStat string
+
 func (ScalarStat) isStat()          {}
 func (ErrorStat) isStat()           {}
 func (SimpleCounterStat) isStat()   {}
 func (CombinedCounterStat) isStat() {}
 func (NameStat) isStat()            {}
+func (EmptyStat) isStat()           {}
 
 func (s ScalarStat) IsZero() bool {
 	return s == 0
 }
+
+func (s ScalarStat) Type() StatType {
+	return ScalarIndex
+}
+
 func (s ErrorStat) IsZero() bool {
 	if s == nil {
 		return true
@@ -164,6 +190,11 @@ func (s ErrorStat) IsZero() bool {
 	}
 	return true
 }
+
+func (s ErrorStat) Type() StatType {
+	return ErrorIndex
+}
+
 func (s SimpleCounterStat) IsZero() bool {
 	if s == nil {
 		return true
@@ -177,6 +208,11 @@ func (s SimpleCounterStat) IsZero() bool {
 	}
 	return true
 }
+
+func (s SimpleCounterStat) Type() StatType {
+	return SimpleCounterVector
+}
+
 func (s CombinedCounterStat) IsZero() bool {
 	if s == nil {
 		return true
@@ -193,6 +229,11 @@ func (s CombinedCounterStat) IsZero() bool {
 	}
 	return true
 }
+
+func (s CombinedCounterStat) Type() StatType {
+	return CombinedCounterVector
+}
+
 func (s NameStat) IsZero() bool {
 	if s == nil {
 		return true
@@ -205,6 +246,18 @@ func (s NameStat) IsZero() bool {
 	return true
 }
 
+func (s NameStat) Type() StatType {
+	return NameVector
+}
+
+func (s EmptyStat) IsZero() bool {
+	return true
+}
+
+func (s EmptyStat) Type() StatType {
+	return Empty
+}
+
 // ReduceSimpleCounterStatIndex returns reduced SimpleCounterStat s for index i.
 func ReduceSimpleCounterStatIndex(s SimpleCounterStat, i int) uint64 {
 	var val uint64
@@ -218,8 +271,8 @@ func ReduceSimpleCounterStatIndex(s SimpleCounterStat, i int) uint64 {
 func ReduceCombinedCounterStatIndex(s CombinedCounterStat, i int) [2]uint64 {
 	var val [2]uint64
 	for _, w := range s {
-		val[0] += uint64(w[i][0])
-		val[1] += uint64(w[i][1])
+		val[0] += w[i][0]
+		val[1] += w[i][1]
 	}
 	return val
 }