X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fsession%2Fsegment_manager.h;h=f6494616a9f5a33ee9ee3d97e10d6ca46d4cb6a8;hb=93e658058033e251b98d18a1f0717a07a85adfc2;hp=2710bb544d7a376d1cb532477e823006dd270b4d;hpb=a5464817522c7a7dc760af4612f1d6a68ed0afc8;p=vpp.git

diff --git a/src/vnet/session/segment_manager.h b/src/vnet/session/segment_manager.h
index 2710bb544d7..f6494616a9f 100644
--- a/src/vnet/session/segment_manager.h
+++ b/src/vnet/session/segment_manager.h
@@ -28,6 +28,9 @@ typedef struct _segment_manager_properties
   u32 rx_fifo_size;
   u32 tx_fifo_size;
 
+  /** Preallocated pool sizes */
+  u32 preallocated_fifo_pairs;
+
   /** Configured additional segment size */
   u32 add_segment_size;
 
@@ -36,6 +39,10 @@ typedef struct _segment_manager_properties
 
   /** Use private memory segment instead of shared memory */
   u8 use_private_segment;
+
+  /** Use one or more private mheaps, instead of the global heap */
+  u32 private_segment_count;
+  u32 private_segment_size;
 } segment_manager_properties_t;
 
 typedef struct _segment_manager
@@ -48,23 +55,25 @@ typedef struct _segment_manager
   /** Owner app index */
   u32 app_index;
 
-  /** Pointer to manager properties. Could be shared among all of
-   * an app's segment managers s*/
-  segment_manager_properties_t *properties;
+  /**
+   * Pointer to manager properties. Could be shared among all of
+   * an app's segment managers s
+   */
+  u32 properties_index;
+
+  /**
+   * First segment should not be deleted unless segment manger is deleted.
+   * This also indicates that the segment manager is the first to have been
+   * allocated for the app.
+   */
+  u8 first_is_protected;
 } segment_manager_t;
 
+#define SEGMENT_MANAGER_INVALID_APP_INDEX ((u32) ~0)
+
 /** Pool of segment managers */
 extern segment_manager_t *segment_managers;
 
-always_inline segment_manager_t *
-segment_manager_new ()
-{
-  segment_manager_t *sm;
-  pool_get (segment_managers, sm);
-  memset (sm, 0, sizeof (*sm));
-  return sm;
-}
-
 always_inline segment_manager_t *
 segment_manager_get (u32 index)
 {
@@ -85,16 +94,18 @@ segment_manager_index (segment_manager_t * sm)
   return sm - segment_managers;
 }
 
+segment_manager_t *segment_manager_new ();
 int
-segment_manager_init (segment_manager_t * sm,
-		      segment_manager_properties_t * properties,
-		      u32 seg_size);
+segment_manager_init (segment_manager_t * sm, u32 props_index, u32 seg_size);
 
 void segment_manager_get_segment_info (u32 index, u8 ** name, u32 * size);
 int
 session_manager_add_first_segment (segment_manager_t * sm, u32 segment_size);
 int session_manager_add_segment (segment_manager_t * sm);
+void segment_manager_del_sessions (segment_manager_t * sm);
 void segment_manager_del (segment_manager_t * sm);
+void segment_manager_init_del (segment_manager_t * sm);
+u8 segment_manager_has_fifos (segment_manager_t * sm);
 int
 segment_manager_alloc_session_fifos (segment_manager_t * sm,
 				     svm_fifo_t ** server_rx_fifo,
@@ -107,6 +118,12 @@ unix_shared_memory_queue_t *segment_manager_alloc_queue (segment_manager_t *
 							 sm, u32 queue_size);
 void segment_manager_dealloc_queue (segment_manager_t * sm,
 				    unix_shared_memory_queue_t * q);
+void segment_manager_app_detach (segment_manager_t * sm);
+
+segment_manager_properties_t *segment_manager_properties_alloc (void);
+void segment_manager_properties_free (segment_manager_properties_t * p);
+segment_manager_properties_t *segment_manager_properties_get (u32 smp_index);
+u32 segment_manager_properties_index (segment_manager_properties_t * p);
 
 #endif /* SRC_VNET_SESSION_SEGMENT_MANAGER_H_ */
 /*