session: optimize ct fifo segment allocations

[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 1036ca2..ef8b970 100644 (file)
--- a/src/vnet/session/segment_manager.h
+++ b/src/vnet/session/segment_manager.h
@@ -78,12 +78,6 @@ typedef struct _segment_manager
   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);
@@ -96,6 +90,7 @@ int segment_manager_init_first (segment_manager_t * sm);
  * @param sm   segment manager to be freed
  */
 void segment_manager_free (segment_manager_t * sm);
+void segment_manager_free_safe (segment_manager_t *sm);
 
 /**
  * Initiate segment manager cleanup
@@ -107,7 +102,8 @@ 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, uword segment_size);
+int segment_manager_add_segment (segment_manager_t *sm, uword segment_size,
+                                u8 notify_app);
 void segment_manager_del_segment (segment_manager_t * sm,
                                  fifo_segment_t * fs);
 void segment_manager_lock_and_del_segment (segment_manager_t * sm,
@@ -137,9 +133,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_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);
@@ -164,9 +160,11 @@ void segment_manager_app_detach (segment_manager_t * sm);
  * @param sm   segment manager whose sessions are to be disconnected
  */
 void segment_manager_del_sessions (segment_manager_t * sm);
+void segment_manager_del_sessions_filter (segment_manager_t *sm,
+                                         session_state_t *states);
 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);