buffers: buffer name is vector, not c string 64/39764/2
authorDamjan Marion <damarion@cisco.com>
Tue, 24 Oct 2023 21:59:48 +0000 (23:59 +0200)
committerDamjan Marion <dmarion@0xa5.net>
Wed, 25 Oct 2023 11:51:30 +0000 (11:51 +0000)
Type: fix
Fixes: 8973b07
Change-Id: Iba6e29bab35be0148b469965c3af8391b5ab9140
Signed-off-by: Damjan Marion <damarion@cisco.com>
src/vlib/buffer.c

index e798743..005326d 100644 (file)
@@ -603,9 +603,10 @@ format_vlib_buffer_pool (u8 * s, va_list * va)
     cached += bpt->n_cached;
   /* *INDENT-ON* */
 
-  s = format (s, "%-20s%=6d%=6d%=6u%=11u%=6u%=8u%=8u%=8u",
-             bp->name, bp->index, bp->numa_node, bp->data_size +
-             sizeof (vlib_buffer_t) + vm->buffer_main->ext_hdr_size,
+  s = format (s, "%-20v%=6d%=6d%=6u%=11u%=6u%=8u%=8u%=8u", bp->name, bp->index,
+             bp->numa_node,
+             bp->data_size + sizeof (vlib_buffer_t) +
+               vm->buffer_main->ext_hdr_size,
              bp->data_size, bp->n_buffers, bp->n_avail, cached,
              bp->n_buffers - bp->n_avail - cached);
 
@@ -897,16 +898,16 @@ vlib_buffer_main_init (struct vlib_main_t * vm)
       continue;
 
     reg.entry_index =
-      vlib_stats_add_gauge ("/buffer-pools/%s/cached", bp->name);
+      vlib_stats_add_gauge ("/buffer-pools/%v/cached", bp->name);
     reg.collect_fn = buffer_gauges_collect_cached_fn;
     vlib_stats_register_collector_fn (&reg);
 
-    reg.entry_index = vlib_stats_add_gauge ("/buffer-pools/%s/used", bp->name);
+    reg.entry_index = vlib_stats_add_gauge ("/buffer-pools/%v/used", bp->name);
     reg.collect_fn = buffer_gauges_collect_used_fn;
     vlib_stats_register_collector_fn (&reg);
 
     reg.entry_index =
-      vlib_stats_add_gauge ("/buffer-pools/%s/available", bp->name);
+      vlib_stats_add_gauge ("/buffer-pools/%v/available", bp->name);
     reg.collect_fn = buffer_gauges_collect_available_fn;
     vlib_stats_register_collector_fn (&reg);
   }