// 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
#cgo CFLAGS: -DPNG_DEBUG=1
#cgo LDFLAGS: -lvppapiclient
-#include <stdlib.h>
-#include <stdio.h>
-#include <stdint.h>
-#include <arpa/inet.h>
-#include <vpp-api/client/vppapiclient.h>
-#include <vpp-api/client/stat_client.h>
-
-static int
-govpp_stat_connect(char *socket_name)
-{
- return stat_segment_connect(socket_name);
-}
-
-static void
-govpp_stat_disconnect()
-{
- stat_segment_disconnect();
-}
-
-static uint32_t*
-govpp_stat_segment_ls(uint8_t **pattern)
-{
- return stat_segment_ls(pattern);
-}
-
-static int
-govpp_stat_segment_vec_len(void *vec)
-{
- return stat_segment_vec_len(vec);
-}
-
-static void
-govpp_stat_segment_vec_free(void *vec)
-{
- stat_segment_vec_free(vec);
-}
-
-static char*
-govpp_stat_segment_dir_index_to_name(uint32_t *dir, uint32_t index)
-{
- return stat_segment_index_to_name(dir[index]);
-}
-
-static stat_segment_data_t*
-govpp_stat_segment_dump(uint32_t *counter_vec)
-{
- return stat_segment_dump(counter_vec);
-}
-
-static stat_segment_data_t
-govpp_stat_segment_dump_index(stat_segment_data_t *data, int index)
-{
- return data[index];
-}
-
-static int
-govpp_stat_segment_data_type(stat_segment_data_t *data)
-{
- return data->type;
-}
-
-static double
-govpp_stat_segment_data_get_scalar_value(stat_segment_data_t *data)
-{
- return data->scalar_value;
-}
-
-static double
-govpp_stat_segment_data_get_error_value(stat_segment_data_t *data)
-{
- return data->error_value;
-}
-
-static uint64_t**
-govpp_stat_segment_data_get_simple_counter(stat_segment_data_t *data)
-{
- return data->simple_counter_vec;
-}
-
-static uint64_t*
-govpp_stat_segment_data_get_simple_counter_index(stat_segment_data_t *data, int index)
-{
- return data->simple_counter_vec[index];
-}
-
-static uint64_t
-govpp_stat_segment_data_get_simple_counter_index_value(stat_segment_data_t *data, int index, int index2)
-{
- return data->simple_counter_vec[index][index2];
-}
-
-static vlib_counter_t**
-govpp_stat_segment_data_get_combined_counter(stat_segment_data_t *data)
-{
- return data->combined_counter_vec;
-}
-
-static vlib_counter_t*
-govpp_stat_segment_data_get_combined_counter_index(stat_segment_data_t *data, int index)
-{
- return data->combined_counter_vec[index];
-}
-
-static uint64_t
-govpp_stat_segment_data_get_combined_counter_index_packets(stat_segment_data_t *data, int index, int index2)
-{
- return data->combined_counter_vec[index][index2].packets;
-}
-
-static uint64_t
-govpp_stat_segment_data_get_combined_counter_index_bytes(stat_segment_data_t *data, int index, int index2)
-{
- return data->combined_counter_vec[index][index2].bytes;
-}
-
-static uint8_t**
-govpp_stat_segment_data_get_name_vector(stat_segment_data_t *data)
-{
- return data->name_vector;
-}
-
-static char*
-govpp_stat_segment_data_get_name_vector_index(stat_segment_data_t *data, int index)
-{
- return data->name_vector[index];
-}
-
-static void
-govpp_stat_segment_data_free(stat_segment_data_t *data)
-{
- stat_segment_data_free(data);
-}
-
-static uint8_t**
-govpp_stat_segment_string_vector(uint8_t ** string_vector, char *string)
-{
- return stat_segment_string_vector(string_vector, string);
-}
+#include "stat_client_wrapper.h"
*/
import "C"
+
import (
"fmt"
"os"
"git.fd.io/govpp.git/adapter"
)
-var (
- // DefaultStatSocket is the default path for the VPP stat socket file.
- DefaultStatSocket = "/run/vpp/stats.sock"
-)
-
// 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
}
var sockName string
if c.socketName == "" {
- sockName = DefaultStatSocket
+ sockName = adapter.DefaultStatsSocket
} else {
sockName = c.socketName
}
+ if _, err := os.Stat(sockName); err != nil {
+ if os.IsNotExist(err) {
+ return fmt.Errorf("stats socket file %q does not exists, ensure that VPP is running with `statseg { ... }` section in config", sockName)
+ }
+ return fmt.Errorf("stats socket file error: %v", err)
+ }
+
rc := C.govpp_stat_connect(C.CString(sockName))
if rc != 0 {
return fmt.Errorf("connecting to VPP stats API failed (rc=%v)", rc)
func (c *statClient) ListStats(patterns ...string) (stats []string, err error) {
dir := C.govpp_stat_segment_ls(convertStringSlice(patterns))
+ if dir == nil {
+ return nil, adapter.ErrStatsDataBusy
+ }
defer C.govpp_stat_segment_vec_free(unsafe.Pointer(dir))
l := C.govpp_stat_segment_vec_len(unsafe.Pointer(dir))
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.ErrStatsDataBusy
+ }
defer C.govpp_stat_segment_vec_free(unsafe.Pointer(dir))
dump := C.govpp_stat_segment_dump(dir)
+ if dump == nil {
+ return nil, adapter.ErrStatsDataBusy
+ }
defer C.govpp_stat_segment_data_free(dump)
l := C.govpp_stat_segment_vec_len(unsafe.Pointer(dump))
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,
}
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))))
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)
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 {
Code Review / govpp.git / blobdiff