diff options
| author |   Damjan Marion <damarion@cisco.com> | 2022-03-01 15:51:18 +0100 |
|---|---|---|
| committer |   Damjan Marion <dmarion@me.com> | 2022-03-09 13:51:31 +0000 |
| commit | 8973b07eecbbfe23a5267975f8052a5c6339c756 (patch) | |
| tree | fe4d3507ff24c18743d3241cd9ab049ee2add062 /src/vpp-api/client/stat_client.h | |
| parent | 317cace6185ae134d78a38e1a20249baf751035e (diff) | |
stats: refactor
Type: refactor
Change-Id: Ifd533a095d979dc55bfbe5fac7e0b7510a4d900c
Signed-off-by: Damjan Marion <damarion@cisco.com>
Diffstat (limited to 'src/vpp-api/client/stat_client.h')
| -rw-r--r-- | src/vpp-api/client/stat_client.h | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/src/vpp-api/client/stat_client.h b/src/vpp-api/client/stat_client.h index 730badd1728..26752718d90 100644 --- a/src/vpp-api/client/stat_client.h +++ b/src/vpp-api/client/stat_client.h @@ -25,7 +25,7 @@ #include <vlib/counter_types.h> #include <time.h> #include <stdbool.h> -#include <vpp/stats/stat_segment_shared.h> +#include <vlib/stats/shared.h> /* Default socket to exchange segment fd */ /* TODO: Get from runtime directory */ @@ -49,8 +49,8 @@ typedef struct typedef struct { uint64_t current_epoch; - stat_segment_shared_header_t *shared_header; - stat_segment_directory_entry_t *directory_vector; + vlib_stats_shared_header_t *shared_header; + vlib_stats_entry_t *directory_vector; ssize_t memory_size; uint64_t timeout; } stat_client_main_t; @@ -115,7 +115,7 @@ static inline int stat_segment_access_start (stat_segment_access_t * sa, stat_client_main_t * sm) { - stat_segment_shared_header_t *shared_header = sm->shared_header; + vlib_stats_shared_header_t *shared_header = sm->shared_header; uint64_t max_time; sa->epoch = shared_header->epoch; @@ -130,10 +130,8 @@ stat_segment_access_start (stat_segment_access_t * sa, while (shared_header->in_progress != 0) ; } - sm->directory_vector = - (stat_segment_directory_entry_t *) stat_segment_adjust (sm, - (void *) - sm->shared_header->directory_vector); + sm->directory_vector = (vlib_stats_entry_t *) stat_segment_adjust ( + sm, (void *) sm->shared_header->directory_vector); if (sm->timeout) return _time_now_nsec () < max_time ? 0 : -1; return 0; @@ -164,7 +162,7 @@ stat_segment_set_timeout (uint64_t timeout) static inline bool stat_segment_access_end (stat_segment_access_t * sa, stat_client_main_t * sm) { - stat_segment_shared_header_t *shared_header = sm->shared_header; + vlib_stats_shared_header_t *shared_header = sm->shared_header; if (shared_header->epoch != sa->epoch || shared_header->in_progress) return false; |