vpp: update 'show bihash' command

[vpp.git] / src / vpp / vnet / main.c

diff --git a/src/vpp/vnet/main.c b/src/vpp/vnet/main.c
index 0e8a206..397cf83 100644 (file)
--- 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;
 }