svm: refactor fifo

[vpp.git] / src / vnet / session / segment_manager.c

diff --git a/src/vnet/session/segment_manager.c b/src/vnet/session/segment_manager.c
index 5247b0e..0a54b96 100644 (file)
--- a/src/vnet/session/segment_manager.c
+++ b/src/vnet/session/segment_manager.c
@@ -83,11 +83,11 @@ segment_manager_segment_index (segment_manager_t * sm, fifo_segment_t * seg)
  * to avoid affecting any of the segments pool readers.
  */
 int
-segment_manager_add_segment (segment_manager_t * sm, u32 segment_size)
+segment_manager_add_segment (segment_manager_t * sm, uword segment_size)
 {
+  uword baseva = (uword) ~ 0ULL, alloc_size, page_size;
+  u32 rnd_margin = 128 << 10, fs_index = ~0;
   segment_manager_main_t *smm = &sm_main;
-  u32 rnd_margin = 128 << 10, fs_index = ~0, page_size;
-  uword baseva = (uword) ~ 0ULL, alloc_size;
   segment_manager_props_t *props;
   fifo_segment_t *fs;
   u8 *seg_name;
@@ -307,7 +307,7 @@ segment_manager_alloc (void)
  * Returns error if ssvm segment(s) allocation fails.
  */
 int
-segment_manager_init (segment_manager_t * sm, u32 first_seg_size,
+segment_manager_init (segment_manager_t * sm, uword first_seg_size,
                      u32 prealloc_fifo_pairs)
 {
   u32 rx_fifo_size, tx_fifo_size, pair_size;
@@ -686,50 +686,6 @@ segment_manager_dealloc_fifos (svm_fifo_t * rx_fifo, svm_fifo_t * tx_fifo)
     segment_manager_segment_reader_unlock (sm);
 }
 
-int
-segment_manager_grow_fifo (segment_manager_t * sm, svm_fifo_t * f, u32 size)
-{
-  fifo_segment_t *fs;
-  int rv;
-
-  fs = segment_manager_get_segment_w_lock (sm, f->segment_index);
-  rv = fifo_segment_grow_fifo (fs, f, size);
-  segment_manager_segment_reader_unlock (sm);
-
-  return rv;
-}
-
-int
-segment_manager_collect_fifo_chunks (segment_manager_t * sm, svm_fifo_t * f)
-{
-  fifo_segment_t *fs;
-  int rv;
-
-  fs = segment_manager_get_segment_w_lock (sm, f->segment_index);
-  rv = fifo_segment_collect_fifo_chunks (fs, f);
-  segment_manager_segment_reader_unlock (sm);
-
-  return rv;
-}
-
-int
-segment_manager_shrink_fifo (segment_manager_t * sm, svm_fifo_t * f, u32 size,
-                            u8 is_producer)
-{
-  int rv;
-
-  rv = svm_fifo_reduce_size (f, size, is_producer);
-
-  /* Nothing to collect at this point */
-  if (!is_producer)
-    return rv;
-
-  if (f->flags & SVM_FIFO_F_COLLECT_CHUNKS)
-    segment_manager_collect_fifo_chunks (sm, f);
-
-  return rv;
-}
-
 u32
 segment_manager_evt_q_expected_size (u32 q_len)
 {