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>
diff --git a/src/vpp-api/client/stat_client.c b/src/vpp-api/client/stat_client.c
index 98c2757..538820a 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 aeca634..31fd82b 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
{
diff --git a/src/vpp/stats/stat_segment.c b/src/vpp/stats/stat_segment.c
index 3c5d4eb..9b6b37b 100644
--- a/src/vpp/stats/stat_segment.c
+++ b/src/vpp/stats/stat_segment.c
@@ -21,7 +21,7 @@
#include <vnet/devices/devices.h> /* vnet_get_aggregate_rx_packets */
#undef HAVE_MEMFD_CREATE
#include <vppinfra/linux/syscall.h>
-
+#include <vpp-api/client/stat_client.h>
stat_segment_main_t stat_segment_main;
/*
diff --git a/src/vpp/stats/stat_segment.h b/src/vpp/stats/stat_segment.h
index 21c7c3b..3ce8280 100644
--- a/src/vpp/stats/stat_segment.h
+++ b/src/vpp/stats/stat_segment.h
@@ -19,18 +19,7 @@
#include <stdatomic.h>
#include <vlib/vlib.h>
#include <vppinfra/socket.h>
-
-/* Default socket to exchange segment fd */
-#define STAT_SEGMENT_SOCKET_FILE "/run/vpp/stats.sock"
-
-typedef enum
-{
- 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;
+#include <vpp-api/client/stat_client.h>
typedef enum
{