From 55a1f288ed96b416dc596d3d5415fcea83da60ae Mon Sep 17 00:00:00 2001 From: Damjan Marion Date: Tue, 24 Oct 2023 23:59:48 +0200 Subject: buffers: buffer name is vector, not c string Type: fix Fixes: 8973b07 Change-Id: Iba6e29bab35be0148b469965c3af8391b5ab9140 Signed-off-by: Damjan Marion --- src/vlib/buffer.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'src/vlib') diff --git a/src/vlib/buffer.c b/src/vlib/buffer.c index e798743bc98..005326d3906 100644 --- a/src/vlib/buffer.c +++ b/src/vlib/buffer.c @@ -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.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.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 (®); } -- cgit 1.2.3-korg