aboutsummaryrefslogtreecommitdiffstats
path: root/src/vnet/session
diff options
context:
space:
mode:
authorFlorin Coras <fcoras@cisco.com>2019-06-09 09:24:33 -0700
committerFlorin Coras <fcoras@cisco.com>2019-06-09 09:25:24 -0700
commit5368bb016f5a0d8888456140ba2bf49371e6985c (patch)
tree19dd239a8c387f4d60271d0bb87045ac82c7dd0d /src/vnet/session
parent7681b1c469eda79003eef550fda460f48e5a08d7 (diff)
svm: improve fifo segment show
Type: refactor Change-Id: I6933205cfb04bc31cabe6e3b1a8044cace93f84c Signed-off-by: Florin Coras <fcoras@cisco.com>
Diffstat (limited to 'src/vnet/session')
-rw-r--r--src/vnet/session/segment_manager.c23
1 files changed, 5 insertions, 18 deletions
diff --git a/src/vnet/session/segment_manager.c b/src/vnet/session/segment_manager.c
index f53026c8778..c0785695d4f 100644
--- a/src/vnet/session/segment_manager.c
+++ b/src/vnet/session/segment_manager.c
@@ -131,7 +131,7 @@ segment_manager_add_segment (segment_manager_t * sm, u32 segment_size)
}
}
else
- seg_name = format (0, "%s%c", "process-private-segment", 0);
+ seg_name = format (0, "%s%c", "process-private", 0);
fs->ssvm.ssvm_size = segment_size;
fs->ssvm.name = seg_name;
@@ -827,13 +827,9 @@ segment_manager_show_fn (vlib_main_t * vm, unformat_input_t * input,
vlib_cli_command_t * cmd)
{
segment_manager_main_t *smm = &sm_main;
- fifo_segment_t *seg;
- segment_manager_t *sm;
u8 show_segments = 0, verbose = 0;
- char *address;
- size_t size;
- u32 active_fifos;
- u32 free_fifos;
+ segment_manager_t *sm;
+ fifo_segment_t *seg;
while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
{
@@ -862,21 +858,12 @@ segment_manager_show_fn (vlib_main_t * vm, unformat_input_t * input,
}
if (show_segments)
{
- vlib_cli_output (vm, "%-15s%15s%15s%15s%15s%15s", "Name", "Type",
- "HeapSize (M)", "ActiveFifos", "FreeFifos", "Address");
+ vlib_cli_output (vm, "%U", format_fifo_segment, 0, verbose);
/* *INDENT-OFF* */
pool_foreach (sm, smm->segment_managers, ({
segment_manager_foreach_segment_w_lock (seg, sm, ({
- fifo_segment_info (seg, &address, &size);
- active_fifos = fifo_segment_num_fifos (seg);
- free_fifos = fifo_segment_num_free_fifos (seg);
- vlib_cli_output (vm, "%-15v%15U%15llu%15u%15u%15llx",
- ssvm_name (&seg->ssvm), format_fifo_segment_type,
- seg, size >> 20ULL, active_fifos, free_fifos,
- address);
- if (verbose)
- vlib_cli_output (vm, "%U", format_fifo_segment, seg, verbose);
+ vlib_cli_output (vm, "%U", format_fifo_segment, seg, verbose);
}));
}));
/* *INDENT-ON* */