svm: make more fifo segment header fields private

[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 a7ce989..e04f626 100644 (file)
--- a/src/vnet/session/segment_manager.c
+++ b/src/vnet/session/segment_manager.c
@@ -87,9 +87,9 @@ segment_manager_segment_index (segment_manager_t * sm, fifo_segment_t * seg)
  * If needed a writer's lock is acquired before allocating a new segment
  * to avoid affecting any of the segments pool readers.
  */
-int
-segment_manager_add_segment (segment_manager_t *sm, uword segment_size,
-                            u8 notify_app)
+static inline int
+segment_manager_add_segment_inline (segment_manager_t *sm, uword segment_size,
+                                   u8 notify_app, u8 flags)
 {
   segment_manager_main_t *smm = &sm_main;
   segment_manager_props_t *props;
@@ -158,10 +158,11 @@ segment_manager_add_segment (segment_manager_t *sm, uword segment_size,
   /*
    * Set watermarks in segment
    */
-  fs->h->high_watermark = sm->high_watermark;
-  fs->h->low_watermark = sm->low_watermark;
+  fs->high_watermark = sm->high_watermark;
+  fs->low_watermark = sm->low_watermark;
+  fs->flags = flags;
+  fs->flags &= ~FIFO_SEGMENT_F_MEM_LIMIT;
   fs->h->pct_first_alloc = props->pct_first_alloc;
-  fs->h->flags &= ~FIFO_SEGMENT_F_MEM_LIMIT;
 
   if (notify_app)
     {
@@ -181,6 +182,20 @@ done:
   return fs_index;
 }
 
+int
+segment_manager_add_segment (segment_manager_t *sm, uword segment_size,
+                            u8 notify_app)
+{
+  return segment_manager_add_segment_inline (sm, segment_size, notify_app, 0);
+}
+
+int
+segment_manager_add_segment2 (segment_manager_t *sm, uword segment_size,
+                             u8 flags)
+{
+  return segment_manager_add_segment_inline (sm, segment_size, 0, flags);
+}
+
 /**
  * Remove segment without lock
  */
@@ -1057,10 +1072,11 @@ segment_manager_format_sessions (segment_manager_t * sm, int verbose)
   if (!sm)
     {
       if (verbose)
-       vlib_cli_output (vm, "%-40s%-20s%-15s%-10s", "Connection", "App",
-                        "API Client", "SegManager");
+       vlib_cli_output (vm, "%-" SESSION_CLI_ID_LEN "s%-20s%-15s%-10s",
+                        "Connection", "App", "API Client", "SegManager");
       else
-       vlib_cli_output (vm, "%-40s%-20s", "Connection", "App");
+       vlib_cli_output (vm, "%-" SESSION_CLI_ID_LEN "s%-20s", "Connection",
+                        "App");
       return;
     }
 
@@ -1086,11 +1102,11 @@ segment_manager_format_sessions (segment_manager_t * sm, int verbose)
            str = format (0, "%U", format_session, session, verbose);
 
            if (verbose)
-             s = format (s, "%-40v%-20v%-15u%-10u", str, app_name,
-                         app_wrk->api_client_index,
+             s = format (s, "%-" SESSION_CLI_ID_LEN "v%-20v%-15u%-10u", str,
+                         app_name, app_wrk->api_client_index,
                          app_wrk->connects_seg_manager);
            else
-             s = format (s, "%-40v%-20v", str, app_name);
+             s = format (s, "%-" SESSION_CLI_ID_LEN "v%-20v", str, app_name);
 
            vlib_cli_output (vm, "%v", s);
            vec_reset_length (s);