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.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'src/vnet/session/session.c') diff --git a/src/vnet/session/session.c b/src/vnet/session/session.c index 1c8b7fb4be4..318e01dbf54 100644 --- a/src/vnet/session/session.c +++ b/src/vnet/session/session.c @@ -155,11 +155,10 @@ session_program_transport_close (session_t * s) if (vlib_thread_is_main_w_barrier () || thread_index == s->thread_index) { wrk = session_main_get_worker (s->thread_index); - elt = session_evt_elt_alloc (wrk); + elt = session_evt_alloc_ctrl (wrk); clib_memset (&elt->evt, 0, sizeof (session_event_t)); elt->evt.session_handle = session_handle (s); elt->evt.event_type = SESSION_CTRL_EVT_CLOSE; - session_evt_add_pending_disconnects (wrk, elt); } else session_send_ctrl_evt_to_thread (s, SESSION_CTRL_EVT_CLOSE); @@ -1404,11 +1403,9 @@ session_manager_main_enable (vlib_main_t * vm) for (i = 0; i < num_threads; i++) { wrk = &smm->wrk[i]; + wrk->ctrl_head = clib_llist_make_head (wrk->event_elts, evt_list); wrk->new_head = clib_llist_make_head (wrk->event_elts, evt_list); wrk->old_head = clib_llist_make_head (wrk->event_elts, evt_list); - wrk->postponed_head = clib_llist_make_head (wrk->event_elts, evt_list); - wrk->disconnects_head = clib_llist_make_head (wrk->event_elts, - evt_list); wrk->vm = vlib_mains[i]; wrk->last_vlib_time = vlib_time_now (vlib_mains[i]); -- cgit 1.2.3-korg