X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=adapter%2Fvppapiclient%2Fstat_client.go;h=4144c6c4360ddb3ee59217535c57d9e2a041d86f;hb=HEAD;hp=389c93bea8f0a7592d883a23cf5d7ee6816448be;hpb=3f0489044a1fbc6539aa8c57ffce6d7b00de7d82;p=govpp.git

diff --git a/adapter/vppapiclient/stat_client.go b/adapter/vppapiclient/stat_client.go
index 389c93b..4144c6c 100644
--- a/adapter/vppapiclient/stat_client.go
+++ b/adapter/vppapiclient/stat_client.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build !windows,!darwin
+// +build !windows,!darwin,!novpp,!beyond18.10
 
 package vppapiclient
 
@@ -25,29 +25,18 @@ package vppapiclient
 import "C"
 
 import (
-	"errors"
 	"fmt"
 	"os"
 	"unsafe"
 
-	"git.fd.io/govpp.git/adapter"
-)
-
-var (
-	ErrStatDirBusy  = errors.New("stat dir busy")
-	ErrStatDumpBusy = errors.New("stat dump busy")
-)
-
-var (
-	// DefaultStatSocket is the default path for the VPP stat socket file.
-	DefaultStatSocket = "/run/vpp/stats.sock"
+	"go.fd.io/govpp/adapter"
 )
 
 // global VPP stats API client, library vppapiclient only supports
 // single connection at a time
 var globalStatClient *statClient
 
-// stubStatClient is the default implementation of StatsAPI.
+// statClient is the default implementation of StatsAPI.
 type statClient struct {
 	socketName string
 }
@@ -66,7 +55,7 @@ func (c *statClient) Connect() error {
 
 	var sockName string
 	if c.socketName == "" {
-		sockName = DefaultStatSocket
+		sockName = adapter.DefaultStatsSocket
 	} else {
 		sockName = c.socketName
 	}
@@ -94,33 +83,36 @@ func (c *statClient) Disconnect() error {
 	return nil
 }
 
-func (c *statClient) ListStats(patterns ...string) (stats []string, err error) {
+func (c *statClient) ListStats(patterns ...string) (indexes []adapter.StatIdentifier, err error) {
 	dir := C.govpp_stat_segment_ls(convertStringSlice(patterns))
 	if dir == nil {
-		return nil, ErrStatDirBusy
+		return nil, adapter.ErrStatsDataBusy
 	}
 	defer C.govpp_stat_segment_vec_free(unsafe.Pointer(dir))
 
 	l := C.govpp_stat_segment_vec_len(unsafe.Pointer(dir))
 	for i := 0; i < int(l); i++ {
 		nameChar := C.govpp_stat_segment_dir_index_to_name(dir, C.uint32_t(i))
-		stats = append(stats, C.GoString(nameChar))
+		indexes = append(indexes, adapter.StatIdentifier{
+			Name:  []byte(C.GoString(nameChar)),
+			Index: uint32(i),
+		})
 		C.free(unsafe.Pointer(nameChar))
 	}
 
-	return stats, nil
+	return indexes, nil
 }
 
-func (c *statClient) DumpStats(patterns ...string) (stats []*adapter.StatEntry, err error) {
+func (c *statClient) DumpStats(patterns ...string) (stats []adapter.StatEntry, err error) {
 	dir := C.govpp_stat_segment_ls(convertStringSlice(patterns))
 	if dir == nil {
-		return nil, ErrStatDirBusy
+		return nil, adapter.ErrStatsDataBusy
 	}
 	defer C.govpp_stat_segment_vec_free(unsafe.Pointer(dir))
 
 	dump := C.govpp_stat_segment_dump(dir)
 	if dump == nil {
-		return nil, ErrStatDumpBusy
+		return nil, adapter.ErrStatsDataBusy
 	}
 	defer C.govpp_stat_segment_data_free(dump)
 
@@ -131,8 +123,11 @@ func (c *statClient) DumpStats(patterns ...string) (stats []*adapter.StatEntry,
 		name := C.GoString(nameChar)
 		typ := adapter.StatType(C.govpp_stat_segment_data_type(&v))
 
-		stat := &adapter.StatEntry{
-			Name: name,
+		stat := adapter.StatEntry{
+			StatIdentifier: adapter.StatIdentifier{
+				Name:  []byte(name),
+				Index: uint32(i),
+			},
 			Type: typ,
 		}
 
@@ -141,7 +136,7 @@ func (c *statClient) DumpStats(patterns ...string) (stats []*adapter.StatEntry,
 			stat.Data = adapter.ScalarStat(C.govpp_stat_segment_data_get_scalar_value(&v))
 
 		case adapter.ErrorIndex:
-			stat.Data = adapter.ErrorStat(C.govpp_stat_segment_data_get_error_value(&v))
+			stat.Data = adapter.ErrorStat([]adapter.Counter{adapter.Counter(C.govpp_stat_segment_data_get_error_value(&v))})
 
 		case adapter.SimpleCounterVector:
 			length := int(C.govpp_stat_segment_vec_len(unsafe.Pointer(C.govpp_stat_segment_data_get_simple_counter(&v))))
@@ -158,9 +153,9 @@ func (c *statClient) DumpStats(patterns ...string) (stats []*adapter.StatEntry,
 			vector := make([][]adapter.CombinedCounter, length)
 			for k := 0; k < length; k++ {
 				for j := 0; j < int(C.govpp_stat_segment_vec_len(unsafe.Pointer(C.govpp_stat_segment_data_get_combined_counter_index(&v, C.int(k))))); j++ {
-					vector[k] = append(vector[k], adapter.CombinedCounter{
-						Packets: adapter.Counter(C.govpp_stat_segment_data_get_combined_counter_index_packets(&v, C.int(k), C.int(j))),
-						Bytes:   adapter.Counter(C.govpp_stat_segment_data_get_combined_counter_index_bytes(&v, C.int(k), C.int(j))),
+					vector[k] = append(vector[k], [2]uint64{
+						uint64(C.govpp_stat_segment_data_get_combined_counter_index_packets(&v, C.int(k), C.int(j))),
+						uint64(C.govpp_stat_segment_data_get_combined_counter_index_bytes(&v, C.int(k), C.int(j))),
 					})
 				}
 			}
@@ -191,6 +186,18 @@ func (c *statClient) DumpStats(patterns ...string) (stats []*adapter.StatEntry,
 	return stats, nil
 }
 
+func (c *statClient) PrepareDir(_ ...string) (*adapter.StatDir, error) {
+	return nil, adapter.ErrNotImplemented
+}
+
+func (c *statClient) PrepareDirOnIndex(_ ...uint32) (*adapter.StatDir, error) {
+	return nil, adapter.ErrNotImplemented
+}
+
+func (c *statClient) UpdateDir(_ *adapter.StatDir) error {
+	return adapter.ErrNotImplemented
+}
+
 func convertStringSlice(strs []string) **C.uint8_t {
 	var arr **C.uint8_t
 	for _, str := range strs {