diff options
author | Damjan Marion <damarion@cisco.com> | 2020-09-30 14:15:24 +0200 |
---|---|---|
committer | Dave Barach <openvpp@barachs.net> | 2020-09-30 19:16:52 +0000 |
commit | f2b4a375d68b29130801c17f05ae66294d007d90 (patch) | |
tree | 48ddf4098368d93c70bc47b17a36ee2680b79691 /src/vpp | |
parent | 558607dc3a96232191f413b9bc894524ff85f2a1 (diff) |
vpp: update 'show bihash' command
Type: improvement
Change-Id: I6d00ba840d2168af0658f97c45a42d39be7cbbad
Signed-off-by: Damjan Marion <damarion@cisco.com>
Diffstat (limited to 'src/vpp')
-rw-r--r-- | src/vpp/vnet/main.c | 52 |
1 files changed, 1 insertions, 51 deletions
diff --git a/src/vpp/vnet/main.c b/src/vpp/vnet/main.c index 0e8a2064ae6..397cf8328c5 100644 --- a/src/vpp/vnet/main.c +++ b/src/vpp/vnet/main.c @@ -471,34 +471,12 @@ vlib_app_num_thread_stacks_needed (void) #include <vppinfra/bihash_8_8.h> -typedef struct -{ - u8 *name; - u64 actual_virt_size; - u64 configured_virt_size; -} name_sort_t; - -static int -name_sort_cmp (void *a1, void *a2) -{ - name_sort_t *n1 = a1; - name_sort_t *n2 = a2; - - return strcmp ((char *) n1->name, (char *) n2->name); -} - static clib_error_t * show_bihash_command_fn (vlib_main_t * vm, unformat_input_t * input, vlib_cli_command_t * cmd) { int i; clib_bihash_8_8_t *h; - u64 total_actual_virt_size = 0; - u64 total_configured_virt_size = 0; - u64 actual_virt_size; - u64 configured_virt_size; - name_sort_t *names = 0; - name_sort_t *this; int verbose = 0; if (unformat (input, "verbose")) @@ -507,37 +485,9 @@ show_bihash_command_fn (vlib_main_t * vm, for (i = 0; i < vec_len (clib_all_bihashes); i++) { h = (clib_bihash_8_8_t *) clib_all_bihashes[i]; - if (alloc_arena (h) || verbose) - { - vec_add2 (names, this, 1); - this->name = format (0, "%s%c", h->name, 0); - configured_virt_size = h->memory_size; - actual_virt_size = alloc_arena (h) ? h->memory_size : 0ULL; - this->actual_virt_size = actual_virt_size; - this->configured_virt_size = configured_virt_size; - total_actual_virt_size += actual_virt_size; - total_configured_virt_size += configured_virt_size; - } + vlib_cli_output (vm, "\n%U", h->fmt_fn, h, verbose); } - vec_sort_with_function (names, name_sort_cmp); - - vlib_cli_output (vm, "%-30s %8s %s", "Name", "Actual", "Configured"); - - for (i = 0; i < vec_len (names); i++) - { - vlib_cli_output (vm, "%-30s %8U %U", names[i].name, - format_memory_size, - names[i].actual_virt_size, - format_memory_size, names[i].configured_virt_size); - vec_free (names[i].name); - } - - vec_free (names); - - vlib_cli_output (vm, "%-30s %8U %U", "Total", - format_memory_size, total_actual_virt_size, - format_memory_size, total_configured_virt_size); return 0; } |