From b0ffbee67bd17f6880a02184d18cd94156f2389e Mon Sep 17 00:00:00 2001 From: Florin Coras Date: Sun, 21 Jul 2019 19:23:46 -0700 Subject: session: separate ctrl, new and old events Type: feature Change-Id: I5e030b23943c012d8191ff657165055d33ec87a2 Signed-off-by: Florin Coras --- src/vnet/session/session.h | 46 ++++++++++------------------------------------ 1 file changed, 10 insertions(+), 36 deletions(-) (limited to 'src/vnet/session/session.h') diff --git a/src/vnet/session/session.h b/src/vnet/session/session.h index 8f7bd6c999c..5af824ade60 100644 --- a/src/vnet/session/session.h +++ b/src/vnet/session/session.h @@ -96,18 +96,15 @@ typedef struct session_worker_ /** Pool of session event list elements */ session_evt_elt_t *event_elts; + /** Head of control events list */ + clib_llist_index_t ctrl_head; + /** Head of list of elements */ clib_llist_index_t new_head; /** Head of list of pending events */ clib_llist_index_t old_head; - /** Head of list of postponed events */ - clib_llist_index_t postponed_head; - - /** Head of list of disconnect events */ - clib_llist_index_t disconnects_head; - /** Peekers rw lock */ clib_rwlock_t peekers_rw_locks; @@ -203,44 +200,21 @@ session_evt_elt_free (session_worker_t * wrk, session_evt_elt_t * elt) pool_put (wrk->event_elts, elt); } -static inline session_evt_elt_t * -session_evt_old_head (session_worker_t * wrk) -{ - return pool_elt_at_index (wrk->event_elts, wrk->old_head); -} - -static inline session_evt_elt_t * -session_evt_postponed_head (session_worker_t * wrk) -{ - return pool_elt_at_index (wrk->event_elts, wrk->postponed_head); -} - -static inline session_evt_elt_t * -session_evt_pending_disconnects_head (session_worker_t * wrk) -{ - return pool_elt_at_index (wrk->event_elts, wrk->disconnects_head); -} - static inline void session_evt_add_old (session_worker_t * wrk, session_evt_elt_t * elt) { clib_llist_add_tail (wrk->event_elts, evt_list, elt, - session_evt_old_head (wrk)); -} - -static inline void -session_evt_add_postponed (session_worker_t * wrk, session_evt_elt_t * elt) -{ - clib_llist_add_tail (wrk->event_elts, evt_list, elt, - session_evt_postponed_head (wrk)); + pool_elt_at_index (wrk->event_elts, wrk->old_head)); } -static inline void -session_evt_add_pending_disconnects (session_worker_t * wrk, - session_evt_elt_t * elt) +static inline session_evt_elt_t * +session_evt_alloc_ctrl (session_worker_t * wrk) { + session_evt_elt_t *elt; + elt = session_evt_elt_alloc (wrk); clib_llist_add_tail (wrk->event_elts, evt_list, elt, - session_evt_pending_disconnects_head (wrk)); + pool_elt_at_index (wrk->event_elts, wrk->ctrl_head)); + return elt; } static inline session_evt_elt_t * -- cgit 1.2.3-korg