From fe97da3203c64461f752e854faa97c69b8d225f4 Mon Sep 17 00:00:00 2001 From: Florin Coras Date: Wed, 6 Mar 2019 10:09:04 -0800 Subject: session: cleanup instances of deprecated io evts Change-Id: Iad119e05ae5e570fbfcf66747c95822cee647c99 Signed-off-by: Florin Coras --- src/tests/vnet/session/tcp_echo.c | 2 +- src/vcl/vppcom.c | 2 +- src/vnet/tls/tls.c | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) (limited to 'src') diff --git a/src/tests/vnet/session/tcp_echo.c b/src/tests/vnet/session/tcp_echo.c index 3531a5307a5..d76e9395a75 100644 --- a/src/tests/vnet/session/tcp_echo.c +++ b/src/tests/vnet/session/tcp_echo.c @@ -916,7 +916,7 @@ clients_run (echo_main_t * em) continue; } e = svm_msg_q_msg_data (em->our_event_queue, &msg); - if (e->event_type != FIFO_EVENT_APP_RX) + if (e->event_type != SESSION_IO_EVT_RX) handle_mq_event (e); svm_msg_q_free_msg (em->our_event_queue, &msg); } diff --git a/src/vcl/vppcom.c b/src/vcl/vppcom.c index fa37a1da68f..72e11942b6a 100644 --- a/src/vcl/vppcom.c +++ b/src/vcl/vppcom.c @@ -1819,7 +1819,7 @@ vcl_select_handle_mq_event (vcl_worker_t * wrk, session_event_t * e, *bits_set += 1; } break; - case FIFO_EVENT_APP_TX: + case SESSION_IO_EVT_TX: sid = e->session_index; session = vcl_session_get (wrk, sid); if (!session) diff --git a/src/vnet/tls/tls.c b/src/vnet/tls/tls.c index 373da7b512c..df5a0686715 100644 --- a/src/vnet/tls/tls.c +++ b/src/vnet/tls/tls.c @@ -54,7 +54,7 @@ int tls_add_vpp_q_rx_evt (session_t * s) { if (svm_fifo_set_event (s->rx_fifo)) - session_send_io_evt_to_thread (s->rx_fifo, FIFO_EVENT_APP_RX); + session_send_io_evt_to_thread (s->rx_fifo, SESSION_IO_EVT_RX); return 0; } @@ -62,7 +62,7 @@ int tls_add_vpp_q_builtin_rx_evt (session_t * s) { if (svm_fifo_set_event (s->rx_fifo)) - session_send_io_evt_to_thread (s->rx_fifo, FIFO_EVENT_BUILTIN_RX); + session_send_io_evt_to_thread (s->rx_fifo, SESSION_IO_EVT_BUILTIN_RX); return 0; } @@ -70,7 +70,7 @@ int tls_add_vpp_q_tx_evt (session_t * s) { if (svm_fifo_set_event (s->tx_fifo)) - session_send_io_evt_to_thread (s->tx_fifo, FIFO_EVENT_APP_TX); + session_send_io_evt_to_thread (s->tx_fifo, SESSION_IO_EVT_TX); return 0; } @@ -79,14 +79,14 @@ tls_add_vpp_q_builtin_tx_evt (session_t * s) { if (svm_fifo_set_event (s->tx_fifo)) session_send_io_evt_to_thread_custom (s, s->thread_index, - FIFO_EVENT_BUILTIN_TX); + SESSION_IO_EVT_BUILTIN_TX); return 0; } static inline int tls_add_app_q_evt (app_worker_t * app, session_t * app_session) { - return app_worker_lock_and_send_event (app, app_session, FIFO_EVENT_APP_RX); + return app_worker_lock_and_send_event (app, app_session, SESSION_IO_EVT_RX); } u32 -- cgit 1.2.3-korg