From ca2cbc974615b4b0406ecbcada1c27266b3aabc7 Mon Sep 17 00:00:00 2001 From: Andrew Yourtchenko Date: Wed, 29 Mar 2017 16:47:10 +0200 Subject: acl-plugin: cleaner node bugfixes (VPP-675) - use the counters in a private struct rather than node error counters - ensure the timer for the non-idle connections is restarted - fix the deletion of conn at the current tail the list Change-Id: I632f63574d2ced95fb75c5e7fb588c78fb3cce1c Signed-off-by: Andrew Yourtchenko (cherry picked from commit 097051a3bd1f63a177c0728f15375afd84a68918) --- src/plugins/acl/acl.h | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'src/plugins/acl/acl.h') diff --git a/src/plugins/acl/acl.h b/src/plugins/acl/acl.h index 47523636d48..f5a1fe0f934 100644 --- a/src/plugins/acl/acl.h +++ b/src/plugins/acl/acl.h @@ -209,6 +209,22 @@ typedef struct { u32 fa_conn_list_head[ACL_N_TIMEOUTS]; u32 fa_conn_list_tail[ACL_N_TIMEOUTS]; + /* Counters for the cleaner thread */ + +#define foreach_fa_cleaner_counter \ + _(fa_cleaner_cnt_delete_by_sw_index, "delete_by_sw_index events") \ + _(fa_cleaner_cnt_delete_by_sw_index_ok, "delete_by_sw_index handled ok") \ + _(fa_cleaner_cnt_unknown_event, "unknown events received") \ + _(fa_cleaner_cnt_deleted_sessions, "sessions deleted") \ + _(fa_cleaner_cnt_timer_restarted, "session idle timers restarted") \ + _(fa_cleaner_cnt_wait_with_timeout, "event wait with timeout called") \ + _(fa_cleaner_cnt_wait_without_timeout, "event wait w/o timeout called") \ + _(fa_cleaner_cnt_event_cycles, "total event cycles") \ + _(fa_cleaner_cnt_already_deleted, "try to delete already deleted conn") \ +/* end of counters */ +#define _(id, desc) u32 id; + foreach_fa_cleaner_counter +#undef _ /* convenience */ vlib_main_t * vlib_main; -- cgit 1.2.3-korg