From d60b432b138eee36606c4f400ee7e3aa3fd5b207 Mon Sep 17 00:00:00 2001 From: Florin Coras Date: Wed, 22 Sep 2021 16:34:49 -0700 Subject: svm: remove unused fifo functions Type: refactor Signed-off-by: Florin Coras Change-Id: I4525bc669d1c42c41dbc398cf239a093b6853298 --- src/plugins/unittest/svm_fifo_test.c | 6 ++-- src/svm/svm_fifo.h | 57 ------------------------------------ 2 files changed, 3 insertions(+), 60 deletions(-) diff --git a/src/plugins/unittest/svm_fifo_test.c b/src/plugins/unittest/svm_fifo_test.c index 4351bced921..a57795c38b9 100644 --- a/src/plugins/unittest/svm_fifo_test.c +++ b/src/plugins/unittest/svm_fifo_test.c @@ -195,7 +195,7 @@ fifo_prepare (fifo_segment_t * fs, u32 fifo_size) f = fifo_segment_alloc_fifo (fs, fifo_size, FIFO_SEGMENT_RX_FIFO); /* Paint 1st fifo chunk with -1's */ - c = svm_fifo_head_chunk (f); + c = f_head_cptr (f); clib_memset (c->data, 0xFF, c->length); svm_fifo_init_ooo_lookup (f, 1 /* deq ooo */ ); @@ -1958,7 +1958,7 @@ sfifo_test_fifo_indirect (vlib_main_t * vm, unformat_input_t * input) svm_fifo_enqueue_nocopy (f, 4096); SFIFO_TEST (svm_fifo_is_sane (f), "fifo should be sane"); - c = svm_fifo_tail_chunk (f); + c = f_tail_cptr (f); SFIFO_TEST (c == f_end_cptr (f), "tail is end chunk"); /* Initialize head chunk */ @@ -1972,7 +1972,7 @@ sfifo_test_fifo_indirect (vlib_main_t * vm, unformat_input_t * input) rv = svm_fifo_dequeue (f, 4096, data_buf); SFIFO_TEST (rv == 4096, "dequeue should work"); - c = svm_fifo_head_chunk (f); + c = f_head_cptr (f); SFIFO_TEST (c == f_end_cptr (f), "head chunk should be last"); rv = svm_fifo_max_read_chunk (f); diff --git a/src/svm/svm_fifo.h b/src/svm/svm_fifo.h index 560628d2d07..aed8770b458 100644 --- a/src/svm/svm_fifo.h +++ b/src/svm/svm_fifo.h @@ -639,63 +639,6 @@ u32 svm_fifo_max_read_chunk (svm_fifo_t * f); */ u32 svm_fifo_max_write_chunk (svm_fifo_t * f); -/** - * Fifo head chunk getter - * - * @param f fifo - * @return head chunk pointer - */ -static inline svm_fifo_chunk_t * -svm_fifo_head_chunk (svm_fifo_t * f) -{ - return f_head_cptr (f); -} - -/** - * Fifo head pointer getter - * - * @param f fifo - * @return head pointer - */ -static inline u8 * -svm_fifo_head (svm_fifo_t * f) -{ - svm_fifo_chunk_t *head_chunk; - if (!f->shr->head_chunk) - return 0; - /* load-relaxed: consumer owned index */ - head_chunk = f_head_cptr (f); - return (head_chunk->data + (f->shr->head - head_chunk->start_byte)); -} - -/** - * Fifo tail chunk getter - * - * @param f fifo - * @return tail chunk pointer - */ -static inline svm_fifo_chunk_t * -svm_fifo_tail_chunk (svm_fifo_t * f) -{ - return f_tail_cptr (f); -} - -/** - * Fifo tail pointer getter - * - * @param f fifo - * @return tail pointer - */ -static inline u8 * -svm_fifo_tail (svm_fifo_t * f) -{ - svm_fifo_chunk_t *tail_chunk; - - /* load-relaxed: producer owned index */ - tail_chunk = f_tail_cptr (f); - return (tail_chunk->data + (f->shr->tail - tail_chunk->start_byte)); -} - /** * Fifo number of subscribers getter * -- cgit 1.2.3-korg