From 2151191e064e7a1fa37df436c0f771ee46fce3b0 Mon Sep 17 00:00:00 2001 From: Filip Tehlar Date: Fri, 7 Apr 2017 10:41:42 +0200 Subject: LISP: make statistics thread safe Change-Id: I056dc6246f79d887d69ad459a6b8b3092a099baa Signed-off-by: Filip Tehlar --- src/vnet/lisp-gpe/lisp_gpe.h | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) (limited to 'src/vnet/lisp-gpe/lisp_gpe.h') diff --git a/src/vnet/lisp-gpe/lisp_gpe.h b/src/vnet/lisp-gpe/lisp_gpe.h index b3821ac8cca..38d76997ce3 100644 --- a/src/vnet/lisp-gpe/lisp_gpe.h +++ b/src/vnet/lisp-gpe/lisp_gpe.h @@ -96,12 +96,6 @@ typedef struct u32 tunnel_index; } lisp_stats_key_t; -typedef struct -{ - u32 pkt_count; - u32 bytes; -} lisp_stats_t; - typedef struct { u32 vni; @@ -110,7 +104,7 @@ typedef struct ip_address_t loc_rloc; ip_address_t rmt_rloc; - lisp_stats_t stats; + vlib_counter_t counters; } lisp_api_stats_t; typedef enum gpe_encap_mode_e @@ -165,8 +159,9 @@ typedef struct lisp_gpe_main gpe_encap_mode_t encap_mode; - lisp_stats_t *lisp_stats_pool; + u8 *dummy_stats_pool; uword *lisp_stats_index_by_key; + vlib_combined_counter_main_t counters; /** convenience */ vlib_main_t *vlib_main; @@ -313,7 +308,7 @@ int vnet_gpe_set_encap_mode (gpe_encap_mode_t mode); u8 vnet_lisp_stats_enable_disable_state (void); vnet_api_error_t vnet_lisp_stats_enable_disable (u8 enable); lisp_api_stats_t *vnet_lisp_get_stats (void); -void vnet_lisp_flush_stats (void); +int vnet_lisp_flush_stats (void); #endif /* included_vnet_lisp_gpe_h */ -- cgit 1.2.3-korg