svm: refactor fifo

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

diff --git a/src/vnet/session/segment_manager.h b/src/vnet/session/segment_manager.h
index 8358c50..52f89ee 100644 (file)
--- a/src/vnet/session/segment_manager.h
+++ b/src/vnet/session/segment_manager.h
@@ -25,12 +25,13 @@ typedef struct _segment_manager_props
   u32 rx_fifo_size;                    /**< receive fifo size */
   u32 tx_fifo_size;                    /**< transmit fifo size */
   u32 evt_q_size;                      /**< event queue length */
-  u32 segment_size;                    /**< first segment size */
   u32 prealloc_fifos;                  /**< preallocated fifo pairs */
-  u32 add_segment_size;                        /**< additional segment size */
+  uword segment_size;                  /**< first segment size */
+  uword add_segment_size;              /**< additional segment size */
   u8 add_segment:1;                    /**< can add new segments flag */
   u8 use_mq_eventfd:1;                 /**< use eventfds for mqs flag */
   u8 reserved:6;                       /**< reserved flags */
+  u8 n_slices;                         /**< number of fs slices/threads */
   ssvm_segment_type_t segment_type;    /**< seg type: if set to SSVM_N_TYPES,
                                             private segments are used */
 } segment_manager_props_t;
@@ -68,7 +69,7 @@ typedef struct segment_manager_main_init_args_
 #define SEGMENT_MANAGER_INVALID_APP_INDEX ((u32) ~0)
 
 segment_manager_t *segment_manager_alloc (void);
-int segment_manager_init (segment_manager_t * sm, u32 first_seg_size,
+int segment_manager_init (segment_manager_t * sm, uword first_seg_size,
                          u32 prealloc_fifo_pairs);
 
 /**
@@ -88,7 +89,7 @@ segment_manager_t *segment_manager_get (u32 index);
 segment_manager_t *segment_manager_get_if_valid (u32 index);
 u32 segment_manager_index (segment_manager_t * sm);
 
-int segment_manager_add_segment (segment_manager_t * sm, u32 segment_size);
+int segment_manager_add_segment (segment_manager_t * sm, uword segment_size);
 void segment_manager_del_segment (segment_manager_t * sm,
                                  fifo_segment_t * fs);
 fifo_segment_t *segment_manager_get_segment (segment_manager_t * sm,
@@ -106,59 +107,17 @@ void segment_manager_segment_reader_unlock (segment_manager_t * sm);
 void segment_manager_segment_writer_unlock (segment_manager_t * sm);
 
 int segment_manager_alloc_session_fifos (segment_manager_t * sm,
+                                        u32 thread_index,
                                         svm_fifo_t ** rx_fifo,
                                         svm_fifo_t ** tx_fifo);
 int segment_manager_try_alloc_fifos (fifo_segment_t * fs,
+                                    u32 thread_index,
                                     u32 rx_fifo_size, u32 tx_fifo_size,
                                     svm_fifo_t ** rx_fifo,
                                     svm_fifo_t ** tx_fifo);
 void segment_manager_dealloc_fifos (svm_fifo_t * rx_fifo,
                                    svm_fifo_t * tx_fifo);
 
-/**
- * Grows fifo owned by segment manager
- *
- * @param sm   segment manager that owns the fifo
- * @param f    fifo to be grown
- * @param size amount of bytes to add to fifo
- * @return     0 on success, negative number otherwise
- */
-int segment_manager_grow_fifo (segment_manager_t * sm, svm_fifo_t * f,
-                              u32 size);
-
-/**
- * Request to shrink fifo owned by segment manager
- *
- * If this is not called by the producer, no attempt is made to reduce the
- * size until the producer tries to enqueue more data. To collect the chunks
- * that are to be removed call @ref segment_manager_collect_fifo_chunks
- *
- * Size reduction does not affect fifo chunk boundaries. Therefore chunks are
- * not split and the amount of bytes to be removed can be equal to or less
- * than what was requested.
- *
- * @param sm           segment manager that owns the fifo
- * @param f            fifo to be shrunk
- * @param size         amount of bytes to remove from fifo
- * @param is_producer  flag that indicates is caller is the producer for the
- *                     fifo.
- * @return             actual number of bytes to be removed
- */
-int segment_manager_shrink_fifo (segment_manager_t * sm, svm_fifo_t * f,
-                                u32 size, u8 is_producer);
-
-/**
- * Collect fifo chunks that are no longer used
- *
- * This should not be called unless SVM_FIFO_F_COLLECT_CHUNKS is set for
- * the fifo. The chunks are returned to the fifo segment freelist.
- *
- * @param sm           segment manager that owns the fifo
- * @param f            fifo whose chunks are to be collected
- * @return             0 on success, error otherwise
- */
-int segment_manager_collect_fifo_chunks (segment_manager_t * sm,
-                                        svm_fifo_t * f);
 u8 segment_manager_has_fifos (segment_manager_t * sm);
 
 svm_msg_q_t *segment_manager_alloc_queue (fifo_segment_t * fs,