aboutsummaryrefslogtreecommitdiffstats
path: root/adapter/vppapiclient
diff options
context:
space:
mode:
Diffstat (limited to 'adapter/vppapiclient')
-rw-r--r--adapter/vppapiclient/stat_client.go30
-rw-r--r--adapter/vppapiclient/stat_client_stub.go8
-rw-r--r--adapter/vppapiclient/vppapiclient.go21
-rw-r--r--adapter/vppapiclient/vppapiclient_stub.go2
4 files changed, 39 insertions, 22 deletions
diff --git a/adapter/vppapiclient/stat_client.go b/adapter/vppapiclient/stat_client.go
index bf19c45..4144c6c 100644
--- a/adapter/vppapiclient/stat_client.go
+++ b/adapter/vppapiclient/stat_client.go
@@ -29,7 +29,7 @@ import (
"os"
"unsafe"
- "git.fd.io/govpp.git/adapter"
+ "go.fd.io/govpp/adapter"
)
// global VPP stats API client, library vppapiclient only supports
@@ -83,7 +83,7 @@ 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, adapter.ErrStatsDataBusy
@@ -93,11 +93,14 @@ func (c *statClient) ListStats(patterns ...string) (stats []string, err error) {
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) {
@@ -121,7 +124,10 @@ func (c *statClient) DumpStats(patterns ...string) (stats []adapter.StatEntry, e
typ := adapter.StatType(C.govpp_stat_segment_data_type(&v))
stat := adapter.StatEntry{
- Name: []byte(name),
+ StatIdentifier: adapter.StatIdentifier{
+ Name: []byte(name),
+ Index: uint32(i),
+ },
Type: typ,
}
@@ -130,7 +136,7 @@ func (c *statClient) DumpStats(patterns ...string) (stats []adapter.StatEntry, e
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 +153,10 @@ func (c *statClient) DumpStats(patterns ...string) (stats []adapter.StatEntry, e
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([2]uint64{
+ 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))),
- }))
+ })
}
}
stat.Data = adapter.CombinedCounterStat(vector)
@@ -180,11 +186,15 @@ func (c *statClient) DumpStats(patterns ...string) (stats []adapter.StatEntry, e
return stats, nil
}
-func (c *statClient) PrepareDir(prefixes ...string) (*adapter.StatDir, error) {
+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(dir *adapter.StatDir) error {
+func (c *statClient) UpdateDir(_ *adapter.StatDir) error {
return adapter.ErrNotImplemented
}
diff --git a/adapter/vppapiclient/stat_client_stub.go b/adapter/vppapiclient/stat_client_stub.go
index c764391..3aa9cc5 100644
--- a/adapter/vppapiclient/stat_client_stub.go
+++ b/adapter/vppapiclient/stat_client_stub.go
@@ -17,7 +17,7 @@
package vppapiclient
import (
- "git.fd.io/govpp.git/adapter"
+ "go.fd.io/govpp/adapter"
)
// stubStatClient is just an stub adapter that does nothing. It builds only on Windows and OSX, where the real
@@ -36,7 +36,7 @@ func (*stubStatClient) Disconnect() error {
return nil
}
-func (*stubStatClient) ListStats(patterns ...string) (statNames []string, err error) {
+func (*stubStatClient) ListStats(patterns ...string) (indexes []adapter.StatIdentifier, err error) {
return nil, adapter.ErrNotImplemented
}
@@ -48,6 +48,10 @@ func (*stubStatClient) PrepareDir(prefixes ...string) (*adapter.StatDir, error)
return nil, adapter.ErrNotImplemented
}
+func (*stubStatClient) PrepareDirOnIndex(indexes ...uint32) (*adapter.StatDir, error) {
+ return nil, adapter.ErrNotImplemented
+}
+
func (*stubStatClient) UpdateDir(dir *adapter.StatDir) error {
return adapter.ErrNotImplemented
}
diff --git a/adapter/vppapiclient/vppapiclient.go b/adapter/vppapiclient/vppapiclient.go
index 977f32d..3ab460d 100644
--- a/adapter/vppapiclient/vppapiclient.go
+++ b/adapter/vppapiclient/vppapiclient.go
@@ -29,12 +29,13 @@ import (
"os"
"path/filepath"
"reflect"
+ "sync/atomic"
"time"
"unsafe"
"github.com/fsnotify/fsnotify"
- "git.fd.io/govpp.git/adapter"
+ "go.fd.io/govpp/adapter"
)
var (
@@ -52,7 +53,7 @@ const (
// global VPP binary API client, library vppapiclient only supports
// single connection at a time
-var globalVppClient *vppClient
+var globalVppClient unsafe.Pointer
// stubVppClient is the default implementation of the VppAPI.
type vppClient struct {
@@ -76,7 +77,8 @@ func NewVppClientWithInputQueueSize(shmPrefix string, inputQueueSize uint16) ada
// Connect connects the process to VPP.
func (a *vppClient) Connect() error {
- if globalVppClient != nil {
+ h := (*vppClient)(atomic.LoadPointer(&globalVppClient))
+ if h != nil {
return fmt.Errorf("already connected to binary API, disconnect first")
}
@@ -92,19 +94,17 @@ func (a *vppClient) Connect() error {
return fmt.Errorf("connecting to VPP binary API failed (rc=%v)", rc)
}
- globalVppClient = a
+ atomic.StorePointer(&globalVppClient, unsafe.Pointer(a))
return nil
}
// Disconnect disconnects the process from VPP.
func (a *vppClient) Disconnect() error {
- globalVppClient = nil
-
+ atomic.StorePointer(&globalVppClient, nil)
rc := C.govpp_disconnect()
if rc != 0 {
return fmt.Errorf("disconnecting from VPP binary API failed (rc=%v)", rc)
}
-
return nil
}
@@ -187,9 +187,12 @@ func (a *vppClient) WaitReady() error {
//export go_msg_callback
func go_msg_callback(msgID C.uint16_t, data unsafe.Pointer, size C.size_t) {
+ h := (*vppClient)(atomic.LoadPointer(&globalVppClient))
+ if h == nil {
+ return
+ }
// convert unsafe.Pointer to byte slice
sliceHeader := &reflect.SliceHeader{Data: uintptr(data), Len: int(size), Cap: int(size)}
byteSlice := *(*[]byte)(unsafe.Pointer(sliceHeader))
-
- globalVppClient.msgCallback(uint16(msgID), byteSlice)
+ h.msgCallback(uint16(msgID), byteSlice)
}
diff --git a/adapter/vppapiclient/vppapiclient_stub.go b/adapter/vppapiclient/vppapiclient_stub.go
index 20ad12b..57b71c3 100644
--- a/adapter/vppapiclient/vppapiclient_stub.go
+++ b/adapter/vppapiclient/vppapiclient_stub.go
@@ -17,7 +17,7 @@
package vppapiclient
import (
- "git.fd.io/govpp.git/adapter"
+ "go.fd.io/govpp/adapter"
)
// stubVppClient is just an stub adapter that does nothing. It builds only on Windows and OSX, where the real