X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fsession%2Fsegment_manager.h;h=454fef879672c1226456789c5dc2c0c1ef0695c8;hb=0f8d10035;hp=cad95509b2e8dfc9658bb477fe7f5a858e9a92d9;hpb=234fe894d80a6ebc7e457bc86f2eea80d5ef01ea;p=vpp.git

diff --git a/src/vnet/session/segment_manager.h b/src/vnet/session/segment_manager.h
index cad95509b2e..454fef87967 100644
--- a/src/vnet/session/segment_manager.h
+++ b/src/vnet/session/segment_manager.h
@@ -19,6 +19,7 @@
 #include <vppinfra/lock.h>
 #include <vppinfra/valloc.h>
 #include <svm/fifo_segment.h>
+#include <vnet/session/session_types.h>
 
 typedef struct _segment_manager_props
 {
@@ -26,6 +27,7 @@ typedef struct _segment_manager_props
   u32 tx_fifo_size;			/**< transmit fifo size */
   u32 evt_q_size;			/**< event queue length */
   u32 prealloc_fifos;			/**< preallocated fifo pairs */
+  u32 prealloc_fifo_hdrs;		/**< preallocated fifo hdrs */
   uword segment_size;			/**< first segment size */
   uword add_segment_size;		/**< additional segment size */
   u8 add_segment:1;			/**< can add new segments flag */
@@ -34,10 +36,18 @@ typedef struct _segment_manager_props
   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 */
+  u32 max_fifo_size;			/**< max fifo size */
   u8 high_watermark;			/**< memory usage high watermark % */
   u8 low_watermark;			/**< memory usage low watermark % */
+  u8 pct_first_alloc;			/**< pct of fifo size to alloc */
 } segment_manager_props_t;
 
+typedef enum seg_manager_flag_
+{
+  SEG_MANAGER_F_DETACHED = 1 << 0,
+  SEG_MANAGER_F_DETACHED_LISTENER = 1 << 1,
+} seg_manager_flag_t;
+
 typedef struct _segment_manager
 {
   /** Pool of segments allocated by this manager */
@@ -61,20 +71,18 @@ typedef struct _segment_manager
    */
   svm_msg_q_t *event_queue;
 
+  u8 flags;
+
+  u32 max_fifo_size;
   u8 high_watermark;
   u8 low_watermark;
 } segment_manager_t;
 
-typedef struct segment_manager_main_init_args_
-{
-  u64 baseva;
-  u64 size;
-} segment_manager_main_init_args_t;
-
 #define SEGMENT_MANAGER_INVALID_APP_INDEX ((u32) ~0)
 
 segment_manager_t *segment_manager_alloc (void);
 int segment_manager_init (segment_manager_t * sm);
+int segment_manager_init_first (segment_manager_t * sm);
 
 /**
  * Cleanup segment manager
@@ -96,6 +104,8 @@ u32 segment_manager_index (segment_manager_t * sm);
 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);
+void segment_manager_lock_and_del_segment (segment_manager_t * sm,
+					   u32 fs_index);
 fifo_segment_t *segment_manager_get_segment (segment_manager_t * sm,
 					     u32 segment_index);
 fifo_segment_t *segment_manager_get_segment_w_handle (u64 sh);
@@ -121,6 +131,9 @@ int segment_manager_try_alloc_fifos (fifo_segment_t * fs,
 				     svm_fifo_t ** tx_fifo);
 void segment_manager_dealloc_fifos (svm_fifo_t * rx_fifo,
 				    svm_fifo_t * tx_fifo);
+void segment_manager_detach_fifo (segment_manager_t * sm, svm_fifo_t * f);
+void segment_manager_attach_fifo (segment_manager_t * sm, svm_fifo_t * f,
+				  session_t * s);
 
 void segment_manager_set_watermarks (segment_manager_t * sm,
 				     u8 high_watermark, u8 low_watermark);
@@ -133,6 +146,7 @@ void segment_manager_dealloc_queue (segment_manager_t * sm, svm_queue_t * q);
 svm_msg_q_t *segment_manager_event_queue (segment_manager_t * sm);
 u32 segment_manager_evt_q_expected_size (u32 q_size);
 
+u8 segment_manager_app_detached (segment_manager_t * sm);
 void segment_manager_app_detach (segment_manager_t * sm);
 
 /**
@@ -146,11 +160,19 @@ void segment_manager_app_detach (segment_manager_t * sm);
 void segment_manager_del_sessions (segment_manager_t * sm);
 void segment_manager_format_sessions (segment_manager_t * sm, int verbose);
 
-void segment_manager_main_init (segment_manager_main_init_args_t * a);
+void segment_manager_main_init (void);
 
 segment_manager_props_t *segment_manager_props_init (segment_manager_props_t *
 						     sm);
 
+static inline void
+segment_manager_parse_segment_handle (u64 segment_handle, u32 * sm_index,
+				      u32 * segment_index)
+{
+  *sm_index = segment_handle >> 32;
+  *segment_index = segment_handle & 0xFFFFFFFF;
+}
+
 #endif /* SRC_VNET_SESSION_SEGMENT_MANAGER_H_ */
 /*
  * fd.io coding-style-patch-verification: ON