From 2152e1cf8b3420d94ba31fe25853977ad945f35a Mon Sep 17 00:00:00 2001
From: Ole Troan <ot@cisco.com>
Date: Fri, 23 Nov 2018 23:07:13 +0100
Subject: stats: Remove unneeded dependencies in stat_client

Remove exposing stat_client_main internals and atomics to
simplify use from C++.

Change-Id: Ie864170fee8b4eaa2fd7f98556cf0ebb46cb1a2a
Signed-off-by: Ole Troan <ot@cisco.com>
---
 src/vpp-api/client/stat_client.c |  8 ++++++++
 src/vpp-api/client/stat_client.h | 20 +++++++++++++-------
 2 files changed, 21 insertions(+), 7 deletions(-)

(limited to 'src/vpp-api/client')

diff --git a/src/vpp-api/client/stat_client.c b/src/vpp-api/client/stat_client.c
index 98c275727f0..538820ad338 100644
--- a/src/vpp-api/client/stat_client.c
+++ b/src/vpp-api/client/stat_client.c
@@ -30,7 +30,15 @@
 #include <vppinfra/lock.h>
 #include "stat_client.h"
 #include <stdatomic.h>
+#include <vpp/stats/stat_segment.h>
 
+struct stat_client_main_t
+{
+  uint64_t current_epoch;
+  stat_segment_shared_header_t *shared_header;
+  stat_segment_directory_entry_t *directory_vector;
+  ssize_t memory_size;
+};
 
 stat_client_main_t stat_client_main;
 
diff --git a/src/vpp-api/client/stat_client.h b/src/vpp-api/client/stat_client.h
index aeca63419ee..31fd82b41e2 100644
--- a/src/vpp-api/client/stat_client.h
+++ b/src/vpp-api/client/stat_client.h
@@ -18,16 +18,22 @@
 #define included_stat_client_h
 
 #include <stdint.h>
-#include <vpp/stats/stat_segment.h>
+#include <unistd.h>
 #include <vlib/counter_types.h>
 
-typedef struct
+typedef enum
 {
-  uint64_t current_epoch;
-  stat_segment_shared_header_t *shared_header;
-  stat_segment_directory_entry_t *directory_vector;
-  ssize_t memory_size;
-} stat_client_main_t;
+  STAT_DIR_TYPE_ILLEGAL = 0,
+  STAT_DIR_TYPE_SCALAR_INDEX,
+  STAT_DIR_TYPE_COUNTER_VECTOR_SIMPLE,
+  STAT_DIR_TYPE_COUNTER_VECTOR_COMBINED,
+  STAT_DIR_TYPE_ERROR_INDEX,
+} stat_directory_type_t;
+
+/* Default socket to exchange segment fd */
+#define STAT_SEGMENT_SOCKET_FILE "/run/vpp/stats.sock"
+
+typedef struct stat_client_main_t stat_client_main_t;
 
 typedef struct
 {
-- 
cgit 1.2.3-korg