From 04943b4c42db300d0d895644f32da79a6d411c51 Mon Sep 17 00:00:00 2001 From: Florin Coras Date: Fri, 25 Dec 2020 11:45:40 -0800 Subject: session: convert evt q segment to fifo segment Type: refactor Signed-off-by: Florin Coras Change-Id: I63a44e11322f6fe27255820524e022f6d710b083 --- src/vnet/session/session_api.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'src/vnet/session/session_api.c') diff --git a/src/vnet/session/session_api.c b/src/vnet/session/session_api.c index a8f92c3cc00..8fe1acf6a6e 100644 --- a/src/vnet/session/session_api.c +++ b/src/vnet/session/session_api.c @@ -601,8 +601,9 @@ vl_api_app_attach_t_handler (vl_api_app_attach_t * mp) { int rv = 0, fds[SESSION_N_FD_TYPE], n_fds = 0; vl_api_app_attach_reply_t *rmp; - ssvm_private_t *segp, *evt_q_segment; + ssvm_private_t *segp; vnet_app_attach_args_t _a, *a = &_a; + fifo_segment_t *evt_q_segment; u8 fd_flags = 0, ctrl_thread; vl_api_registration_t *reg; svm_msg_q_t *ctrl_mq; @@ -645,7 +646,7 @@ vl_api_app_attach_t_handler (vl_api_app_attach_t * mp) if ((evt_q_segment = session_main_get_evt_q_segment ())) { fd_flags |= SESSION_FD_F_VPP_MQ_SEGMENT; - fds[n_fds] = evt_q_segment->fd; + fds[n_fds] = evt_q_segment->ssvm.fd; n_fds += 1; } /* Send fifo segment fd if needed */ @@ -1335,7 +1336,7 @@ session_api_attach_handler (app_namespace_t * app_ns, clib_socket_t * cs, int rv = 0, fds[SESSION_N_FD_TYPE], n_fds = 0; vnet_app_attach_args_t _a, *a = &_a; app_sapi_attach_reply_msg_t *rmp; - ssvm_private_t *evt_q_segment; + fifo_segment_t *evt_q_segment; u8 fd_flags = 0, ctrl_thread; app_ns_api_handle_t *handle; app_sapi_msg_t msg = { 0 }; @@ -1364,7 +1365,7 @@ session_api_attach_handler (app_namespace_t * app_ns, clib_socket_t * cs, if ((evt_q_segment = session_main_get_evt_q_segment ())) { fd_flags |= SESSION_FD_F_VPP_MQ_SEGMENT; - fds[n_fds] = evt_q_segment->fd; + fds[n_fds] = evt_q_segment->ssvm.fd; n_fds += 1; } /* Send fifo segment fd if needed */ -- cgit 1.2.3-korg