misc: move to new pool_foreach macros

[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 d734d64..65f3f08 100644 (file)
--- a/src/vnet/session/segment_manager.c
+++ b/src/vnet/session/segment_manager.c
@@ -39,7 +39,7 @@ static segment_manager_main_t sm_main;
 #define segment_manager_foreach_segment_w_lock(VAR, SM, BODY)          \
 do {                                                                   \
     clib_rwlock_reader_lock (&(SM)->segments_rwlock);                  \
-    pool_foreach((VAR), ((SM)->segments), (BODY));                     \
+    pool_foreach((VAR), ((SM)->segments)) (BODY);                      \
     clib_rwlock_reader_unlock (&(SM)->segments_rwlock);                        \
 } while (0)
 
@@ -231,7 +231,7 @@ segment_manager_get_segment_if_valid (segment_manager_t * sm,
  * Removes segment after acquiring writer lock
  */
 static inline void
-segment_manager_lock_and_del_segment (segment_manager_t * sm, u32 fs_index)
+sm_lock_and_del_segment_inline (segment_manager_t * sm, u32 fs_index)
 {
   fifo_segment_t *fs;
   u8 is_prealloc;
@@ -252,6 +252,12 @@ done:
   clib_rwlock_writer_unlock (&sm->segments_rwlock);
 }
 
+void
+segment_manager_lock_and_del_segment (segment_manager_t * sm, u32 fs_index)
+{
+  sm_lock_and_del_segment_inline (sm, fs_index);
+}
+
 /**
  * Reads a segment from the segment manager's pool without lock
  */
@@ -333,21 +339,12 @@ segment_manager_alloc (void)
   return sm;
 }
 
-/**
- * Initializes segment manager based on options provided.
- * Returns error if ssvm segment(s) allocation fails.
- */
 int
 segment_manager_init (segment_manager_t * sm)
 {
   segment_manager_props_t *props;
-  uword first_seg_size;
-  fifo_segment_t *fs;
-  int fs_index, i;
 
   props = segment_manager_properties_get (sm);
-  first_seg_size = clib_max (props->segment_size,
-                            sm_main.default_segment_size);
 
   sm->max_fifo_size = props->max_fifo_size ?
     props->max_fifo_size : sm_main.default_max_fifo_size;
@@ -356,6 +353,25 @@ segment_manager_init (segment_manager_t * sm)
   segment_manager_set_watermarks (sm,
                                  props->high_watermark,
                                  props->low_watermark);
+  return 0;
+}
+
+/**
+ * Initializes segment manager based on options provided.
+ * Returns error if ssvm segment(s) allocation fails.
+ */
+int
+segment_manager_init_first (segment_manager_t * sm)
+{
+  segment_manager_props_t *props;
+  uword first_seg_size;
+  fifo_segment_t *fs;
+  int fs_index, i;
+
+  segment_manager_init (sm);
+  props = segment_manager_properties_get (sm);
+  first_seg_size = clib_max (props->segment_size,
+                            sm_main.default_segment_size);
 
   if (props->prealloc_fifos)
     {
@@ -466,9 +482,9 @@ segment_manager_free (segment_manager_t * sm)
   clib_rwlock_writer_lock (&sm->segments_rwlock);
 
   /* *INDENT-OFF* */
-  pool_foreach (fifo_segment, sm->segments, ({
+  pool_foreach (fifo_segment, sm->segments)  {
     segment_manager_del_segment (sm, fifo_segment);
-  }));
+  }
   /* *INDENT-ON* */
 
   clib_rwlock_writer_unlock (&sm->segments_rwlock);
@@ -651,14 +667,14 @@ segment_manager_alloc_session_fifos (segment_manager_t * sm,
   segment_manager_segment_reader_lock (sm);
 
   /* *INDENT-OFF* */
-  pool_foreach (cur, sm->segments, ({
+  pool_foreach (cur, sm->segments)  {
     free_bytes = fifo_segment_available_bytes (cur);
     if (free_bytes > max_free_bytes)
       {
         max_free_bytes = free_bytes;
         fs = cur;
       }
-  }));
+  }
   /* *INDENT-ON* */
 
   if (fs)
@@ -764,7 +780,7 @@ segment_manager_dealloc_fifos (svm_fifo_t * rx_fifo, svm_fifo_t * tx_fifo)
 
       /* Remove segment if it holds no fifos or first but not protected */
       if (segment_index != 0 || !sm->first_is_protected)
-       segment_manager_lock_and_del_segment (sm, segment_index);
+       sm_lock_and_del_segment_inline (sm, segment_index);
 
       /* Remove segment manager if no sessions and detached from app */
       if (segment_manager_app_detached (sm)
@@ -939,7 +955,7 @@ segment_manager_show_fn (vlib_main_t * vm, unformat_input_t * input,
                       "HighWater", "LowWater", "FifoTuning");
 
       /* *INDENT-OFF* */
-      pool_foreach (sm, smm->segment_managers, ({
+      pool_foreach (sm, smm->segment_managers)  {
         app_wrk = app_worker_get_if_valid (sm->app_wrk_index);
         app = app_wrk ? application_get (app_wrk->app_index) : 0;
         custom_logic = (app && (app->cb_fns.fifo_tuning_callback)) ? 1 : 0;
@@ -951,7 +967,7 @@ segment_manager_show_fn (vlib_main_t * vm, unformat_input_t * input,
                          format_memory_size, max_fifo_size,
                          sm->high_watermark, sm->low_watermark,
                          custom_logic ? "custom" : "none");
-      }));
+      }
       /* *INDENT-ON* */
 
       vlib_cli_output (vm, "\n");
@@ -961,11 +977,11 @@ segment_manager_show_fn (vlib_main_t * vm, unformat_input_t * input,
       vlib_cli_output (vm, "%U", format_fifo_segment, 0, verbose);
 
       /* *INDENT-OFF* */
-      pool_foreach (sm, smm->segment_managers, ({
+      pool_foreach (sm, smm->segment_managers)  {
          segment_manager_foreach_segment_w_lock (seg, sm, ({
            vlib_cli_output (vm, "%U", format_fifo_segment, seg, verbose);
          }));
-      }));
+      }
       /* *INDENT-ON* */
 
     }
@@ -1008,7 +1024,7 @@ segment_manager_format_sessions (segment_manager_t * sm, int verbose)
   clib_rwlock_reader_lock (&sm->segments_rwlock);
 
   /* *INDENT-OFF* */
-  pool_foreach (fs, sm->segments, ({
+  pool_foreach (fs, sm->segments)  {
     for (slice_index = 0; slice_index < fs->n_slices; slice_index++)
       {
         f = fifo_segment_get_slice_fifo_list (fs, slice_index);
@@ -1024,10 +1040,10 @@ segment_manager_format_sessions (segment_manager_t * sm, int verbose)
             str = format (0, "%U", format_session, session, verbose);
 
             if (verbose)
-              s = format (s, "%-40s%-20s%-15u%-10u", str, app_name,
+              s = format (s, "%-40v%-20v%-15u%-10u", str, app_name,
                           app_wrk->api_client_index, app_wrk->connects_seg_manager);
             else
-              s = format (s, "%-40s%-20s", str, app_name);
+              s = format (s, "%-40v%-20v", str, app_name);
 
             vlib_cli_output (vm, "%v", s);
             vec_reset_length (s);
@@ -1037,7 +1053,7 @@ segment_manager_format_sessions (segment_manager_t * sm, int verbose)
           }
         vec_free (s);
       }
-  }));
+  }
   /* *INDENT-ON* */
 
   clib_rwlock_reader_unlock (&sm->segments_rwlock);