From 91b364010cc81260f81af19bae6fd5ec22ee3b90 Mon Sep 17 00:00:00 2001 From: Florin Coras Date: Tue, 17 Nov 2020 15:56:38 -0800 Subject: svm: init chunk rb tree indices in fifo Type: improvement Let fifo segment mainly deal with fifo and chunk allocations not initialization. Signed-off-by: Florin Coras Change-Id: I1f1eb5a1423ba52cb950ae771641fd7eeff4e76c --- src/svm/fifo_segment.c | 4 ---- src/svm/svm_fifo.c | 2 ++ 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'src/svm') diff --git a/src/svm/fifo_segment.c b/src/svm/fifo_segment.c index 473cdf31b64..9cbd7205853 100644 --- a/src/svm/fifo_segment.c +++ b/src/svm/fifo_segment.c @@ -512,8 +512,6 @@ fsh_try_alloc_chunk_batch (fifo_segment_header_t * fsh, { c->start_byte = 0; c->length = rounded_data_size; - c->enq_rb_index = RBTREE_TNIL_INDEX; - c->deq_rb_index = RBTREE_TNIL_INDEX; c->next = head; head = c; cmem += sizeof (*c) + rounded_data_size; @@ -708,8 +706,6 @@ fsh_slice_collect_chunks (fifo_segment_header_t * fsh, CLIB_MEM_UNPOISON (c, sizeof (*c)); next = c->next; fl_index = fs_freelist_for_size (c->length); - c->enq_rb_index = RBTREE_TNIL_INDEX; - c->deq_rb_index = RBTREE_TNIL_INDEX; fss_chunk_free_list_push (fss, fl_index, c); n_collect += fs_freelist_index_to_size (fl_index); c = next; diff --git a/src/svm/svm_fifo.c b/src/svm/svm_fifo.c index d49cbe2bf7d..d357eb6b8a9 100644 --- a/src/svm/svm_fifo.c +++ b/src/svm/svm_fifo.c @@ -389,11 +389,13 @@ svm_fifo_init (svm_fifo_t * f, u32 size) */ f->start_chunk->start_byte = 0; prev = f->start_chunk; + prev->enq_rb_index = prev->deq_rb_index = RBTREE_TNIL_INDEX; c = prev->next; while (c) { c->start_byte = prev->start_byte + prev->length; + c->enq_rb_index = c->deq_rb_index = RBTREE_TNIL_INDEX; prev = c; c = c->next; } -- cgit 1.2.3-korg