Provide error counters per worker for statsclient

[govpp.git] / adapter / vppapiclient / stat_client.go

diff --git a/adapter/vppapiclient/stat_client.go b/adapter/vppapiclient/stat_client.go
index a54ef83..a124f59 100644 (file)
--- 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,!novpp
+// +build !windows,!darwin,!novpp,!beyond18.10
 
 package vppapiclient
 
@@ -86,7 +86,7 @@ func (c *statClient) Disconnect() error {
 func (c *statClient) ListStats(patterns ...string) (stats []string, err error) {
        dir := C.govpp_stat_segment_ls(convertStringSlice(patterns))
        if dir == nil {
-               return nil, adapter.ErrStatDirBusy
+               return nil, adapter.ErrStatsDataBusy
        }
        defer C.govpp_stat_segment_vec_free(unsafe.Pointer(dir))
 
@@ -100,16 +100,16 @@ func (c *statClient) ListStats(patterns ...string) (stats []string, err error) {
        return stats, 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, adapter.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, adapter.ErrStatDumpBusy
+               return nil, adapter.ErrStatsDataBusy
        }
        defer C.govpp_stat_segment_data_free(dump)
 
@@ -120,8 +120,8 @@ 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{
+                       Name: []byte(name),
                        Type: typ,
                }
 
@@ -130,7 +130,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))))
@@ -147,10 +147,10 @@ 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], adapter.CombinedCounter([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))),
+                                       }))
                                }
                        }
                        stat.Data = adapter.CombinedCounterStat(vector)
@@ -180,6 +180,14 @@ func (c *statClient) DumpStats(patterns ...string) (stats []*adapter.StatEntry,
        return stats, nil
 }
 
+func (c *statClient) PrepareDir(prefixes ...string) (*adapter.StatDir, error) {
+       return nil, adapter.ErrNotImplemented
+}
+
+func (c *statClient) UpdateDir(dir *adapter.StatDir) error {
+       return adapter.ErrNotImplemented
+}
+
 func convertStringSlice(strs []string) **C.uint8_t {
        var arr **C.uint8_t
        for _, str := range strs {