From 2d379d8cc7612c2a29670aa66d3d2b0a4007b951 Mon Sep 17 00:00:00 2001 From: Florin Coras Date: Fri, 28 Jun 2019 12:45:12 -0700 Subject: svm: rename fifo tx notifications to reflect use Type: refactor Change-Id: I651db44acdcb666a9c63e1037352cf88c68795b5 Signed-off-by: Florin Coras --- src/plugins/hs_apps/sapi/quic_echo.c | 4 ++-- src/plugins/quic/quic.c | 14 +++++++------- src/plugins/tlsopenssl/tls_openssl.c | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) (limited to 'src/plugins') diff --git a/src/plugins/hs_apps/sapi/quic_echo.c b/src/plugins/hs_apps/sapi/quic_echo.c index 3c9ddcc102d..fa8e69febde 100644 --- a/src/plugins/hs_apps/sapi/quic_echo.c +++ b/src/plugins/hs_apps/sapi/quic_echo.c @@ -638,7 +638,7 @@ echo_session_dequeue_notify (echo_session_t * s) int rv; rv = app_send_io_evt_to_vpp (s->vpp_evt_q, s->rx_fifo->master_session_index, SESSION_IO_EVT_RX, SVM_Q_WAIT); - svm_fifo_clear_tx_ntf (s->rx_fifo); + svm_fifo_clear_deq_ntf (s->rx_fifo); if (rv) ECHO_FAIL ("app_send_io_evt_to_vpp errored %d", rv); } @@ -825,7 +825,7 @@ recv_data_chunk (echo_main_t * em, echo_session_t * s, u8 * rx_buf) n_read = app_recv_stream ((app_session_t *) s, rx_buf, vec_len (rx_buf)); if (n_read <= 0) return 0; - if (svm_fifo_needs_tx_ntf (s->rx_fifo, n_read)) + if (svm_fifo_needs_deq_ntf (s->rx_fifo, n_read)) echo_session_dequeue_notify (s); if (em->test_return_packets) diff --git a/src/plugins/quic/quic.c b/src/plugins/quic/quic.c index 93c01628e80..a990d0448bf 100644 --- a/src/plugins/quic/quic.c +++ b/src/plugins/quic/quic.c @@ -586,9 +586,9 @@ quic_accept_stream (void *s) quicly_reset_stream (stream, QUIC_APP_ALLOCATION_ERROR); return; } - svm_fifo_add_want_tx_ntf (stream_session->rx_fifo, - SVM_FIFO_WANT_TX_NOTIF_IF_FULL | - SVM_FIFO_WANT_TX_NOTIF_IF_EMPTY); + svm_fifo_add_want_deq_ntf (stream_session->rx_fifo, + SVM_FIFO_WANT_DEQ_NOTIF_IF_FULL | + SVM_FIFO_WANT_DEQ_NOTIF_IF_EMPTY); rv = app_worker_accept_notify (app_wrk, stream_session); if (rv) @@ -1243,9 +1243,9 @@ quic_connect_new_stream (session_endpoint_cfg_t * sep) return app_worker_connect_notify (app_wrk, NULL, sep->opaque); } - svm_fifo_add_want_tx_ntf (stream_session->rx_fifo, - SVM_FIFO_WANT_TX_NOTIF_IF_FULL | - SVM_FIFO_WANT_TX_NOTIF_IF_EMPTY); + svm_fifo_add_want_deq_ntf (stream_session->rx_fifo, + SVM_FIFO_WANT_DEQ_NOTIF_IF_FULL | + SVM_FIFO_WANT_DEQ_NOTIF_IF_EMPTY); stream_session->session_state = SESSION_STATE_READY; if (app_worker_connect_notify (app_wrk, stream_session, sep->opaque)) @@ -1842,7 +1842,7 @@ quic_custom_app_rx_callback (transport_connection_t * tc) session_t *stream_session = session_get (tc->s_index, tc->thread_index); QUIC_DBG (2, "Received app READ notification"); quic_ack_rx_data (stream_session); - svm_fifo_reset_tx_ntf (stream_session->rx_fifo); + svm_fifo_reset_has_deq_ntf (stream_session->rx_fifo); return 0; } diff --git a/src/plugins/tlsopenssl/tls_openssl.c b/src/plugins/tlsopenssl/tls_openssl.c index 4d4c4c37170..6cb8ff08b7f 100644 --- a/src/plugins/tlsopenssl/tls_openssl.c +++ b/src/plugins/tlsopenssl/tls_openssl.c @@ -333,7 +333,7 @@ openssl_ctx_write (tls_ctx_t * ctx, session_t * app_session) } } - if (svm_fifo_needs_tx_ntf (app_session->tx_fifo, wrote)) + if (svm_fifo_needs_deq_ntf (app_session->tx_fifo, wrote)) session_dequeue_notify (app_session); if (wrote < deq_max) -- cgit 1.2.3-korg