diff options
author | 2017-04-07 10:41:42 +0200 | |
---|---|---|
committer | 2017-04-13 08:43:06 +0000 | |
commit | 2151191e064e7a1fa37df436c0f771ee46fce3b0 (patch) | |
tree | 8d84816aedf0403cf9a9931f2346f48ece5be2d8 /src/vnet/lisp-gpe/lisp_gpe_fwd_entry.c | |
parent | 30d857cd07785461f993ec4a935d99af75673f4a (diff) |
LISP: make statistics thread safe
Change-Id: I056dc6246f79d887d69ad459a6b8b3092a099baa
Signed-off-by: Filip Tehlar <ftehlar@cisco.com>
Diffstat (limited to 'src/vnet/lisp-gpe/lisp_gpe_fwd_entry.c')
-rw-r--r-- | src/vnet/lisp-gpe/lisp_gpe_fwd_entry.c | 63 |
1 files changed, 49 insertions, 14 deletions
diff --git a/src/vnet/lisp-gpe/lisp_gpe_fwd_entry.c b/src/vnet/lisp-gpe/lisp_gpe_fwd_entry.c index d2954e96..6d400f75 100644 --- a/src/vnet/lisp-gpe/lisp_gpe_fwd_entry.c +++ b/src/vnet/lisp-gpe/lisp_gpe_fwd_entry.c @@ -410,6 +410,43 @@ lisp_gpe_fwd_entry_mk_paths (lisp_gpe_fwd_entry_t * lfe, vec_sort_with_function (lfe->paths, lisp_gpe_fwd_entry_path_sort); } +void +vnet_lisp_gpe_add_fwd_counters (vnet_lisp_gpe_add_del_fwd_entry_args_t * a, + u32 fwd_entry_index) +{ + const lisp_gpe_adjacency_t *ladj; + lisp_fwd_path_t *path; + lisp_gpe_main_t *lgm = vnet_lisp_gpe_get_main (); + u8 *dummy_elt; + lisp_gpe_fwd_entry_t *lfe; + lisp_gpe_fwd_entry_key_t fe_key; + lisp_stats_key_t key; + + lfe = find_fwd_entry (lgm, a, &fe_key); + + if (LISP_GPE_FWD_ENTRY_TYPE_NORMAL != lfe->type) + return; + + memset (&key, 0, sizeof (key)); + key.fwd_entry_index = fwd_entry_index; + + vec_foreach (path, lfe->paths) + { + ladj = lisp_gpe_adjacency_get (path->lisp_adj); + key.tunnel_index = ladj->tunnel_index; + lisp_stats_key_t *key_copy = clib_mem_alloc (sizeof (*key_copy)); + memcpy (key_copy, &key, sizeof (*key_copy)); + pool_get (lgm->dummy_stats_pool, dummy_elt); + hash_set_mem (lgm->lisp_stats_index_by_key, key_copy, + dummy_elt - lgm->dummy_stats_pool); + + vlib_validate_combined_counter (&lgm->counters, + dummy_elt - lgm->dummy_stats_pool); + vlib_zero_combined_counter (&lgm->counters, + dummy_elt - lgm->dummy_stats_pool); + } +} + /** * @brief Add/Delete LISP IP forwarding entry. * @@ -1172,19 +1209,17 @@ vnet_lisp_gpe_add_del_fwd_entry (vnet_lisp_gpe_add_del_fwd_entry_args_t * a, } } -void +int vnet_lisp_flush_stats (void) { lisp_gpe_main_t *lgm = vnet_lisp_gpe_get_main (); - lisp_stats_t *stat; + vlib_combined_counter_main_t *cm = &lgm->counters; + u32 i; - /* *INDENT-OFF* */ - pool_foreach (stat, lgm->lisp_stats_pool, - { - stat->pkt_count = 0; - stat->bytes = 0; - }); - /* *INDENT-ON* */ + for (i = 0; i < vlib_combined_counter_n_counters (cm); i++) + vlib_zero_combined_counter (cm, i); + + return 0; } static void @@ -1194,7 +1229,7 @@ lisp_del_adj_stats (lisp_gpe_main_t * lgm, u32 fwd_entry_index, u32 ti) lisp_stats_key_t key; void *key_copy; uword *p; - lisp_stats_t *s; + u8 *s; memset (&key, 0, sizeof (key)); key.fwd_entry_index = fwd_entry_index; @@ -1203,18 +1238,18 @@ lisp_del_adj_stats (lisp_gpe_main_t * lgm, u32 fwd_entry_index, u32 ti) p = hash_get_mem (lgm->lisp_stats_index_by_key, &key); if (p) { - s = pool_elt_at_index (lgm->lisp_stats_pool, p[0]); + s = pool_elt_at_index (lgm->dummy_stats_pool, p[0]); hp = hash_get_pair (lgm->lisp_stats_index_by_key, &key); key_copy = (void *) (hp->key); hash_unset_mem (lgm->lisp_stats_index_by_key, &key); clib_mem_free (key_copy); - pool_put (lgm->lisp_stats_pool, s); + pool_put (lgm->dummy_stats_pool, s); } } void -vnet_lisp_del_fwd_stats (vnet_lisp_gpe_add_del_fwd_entry_args_t * a, - u32 fwd_entry_index) +vnet_lisp_gpe_del_fwd_counters (vnet_lisp_gpe_add_del_fwd_entry_args_t * a, + u32 fwd_entry_index) { lisp_gpe_main_t *lgm = &lisp_gpe_main; lisp_gpe_fwd_entry_key_t fe_key; |