summaryrefslogtreecommitdiffstats
path: root/adapter/vppapiclient
diff options
context:
space:
mode:
authorOndrej Fabry <ofabry@cisco.com>2019-04-11 10:59:49 +0200
committerOndrej Fabry <ofabry@cisco.com>2019-04-11 10:59:49 +0200
commitdf1b888a2bfadefadc7dbfce59d34f811ff002ec (patch)
tree054ac4d90c744b867255e8e88ac0c38bd46e8d64 /adapter/vppapiclient
parent3dc9b9885e3d7041a7c349185dc88f3bed50be6d (diff)
Add support for names vector and fill name in interface/node stats
Change-Id: I3a6bcb635701c0f00e47d04fce2113e1ac23b67b Signed-off-by: Ondrej Fabry <ofabry@cisco.com>
Diffstat (limited to 'adapter/vppapiclient')
-rw-r--r--adapter/vppapiclient/stat_client.go28
1 files changed, 26 insertions, 2 deletions
diff --git a/adapter/vppapiclient/stat_client.go b/adapter/vppapiclient/stat_client.go
index df192f6..a2a9826 100644
--- a/adapter/vppapiclient/stat_client.go
+++ b/adapter/vppapiclient/stat_client.go
@@ -40,7 +40,7 @@ govpp_stat_disconnect()
}
static uint32_t*
-govpp_stat_segment_ls(uint8_t ** pattern)
+govpp_stat_segment_ls(uint8_t **pattern)
{
return stat_segment_ls(pattern);
}
@@ -135,6 +135,18 @@ govpp_stat_segment_data_get_combined_counter_index_bytes(stat_segment_data_t *da
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)
{
@@ -268,8 +280,20 @@ func (c *statClient) DumpStats(patterns ...string) (stats []*adapter.StatEntry,
}
stat.Data = adapter.CombinedCounterStat(vector)
+ case adapter.NameVector:
+ length := int(C.govpp_stat_segment_vec_len(unsafe.Pointer(C.govpp_stat_segment_data_get_name_vector(&v))))
+ var vector []adapter.Name
+ for k := 0; k < length; k++ {
+ s := C.govpp_stat_segment_data_get_name_vector_index(&v, C.int(k))
+ if s == nil {
+ continue
+ }
+ vector = append(vector, adapter.Name(C.GoString(s)))
+ }
+ stat.Data = adapter.NameStat(vector)
+
default:
- fmt.Fprintf(os.Stderr, "invalid stat type: %v (%d)", typ, typ)
+ fmt.Fprintf(os.Stderr, "invalid stat type: %v (%v)\n", typ, name)
continue
}