dhcp: Move to plugin

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

diff --git a/src/vpp/vnet/main.c b/src/vpp/vnet/main.c
index 6819ae6..673120a 100644 (file)
--- a/src/vpp/vnet/main.c
+++ b/src/vpp/vnet/main.c
@@ -31,6 +31,7 @@
  */
 char *vlib_plugin_path = NULL;
 char *vlib_plugin_app_version = VPP_BUILD_VER;
+char *vat_plugin_path = NULL;
 
 static void
 vpp_find_plugin_path ()
@@ -219,6 +220,11 @@ main (int argc, char *argv[])
          if (i < (argc - 1))
            vlib_plugin_path = argv[++i];
        }
+      if (!strncmp (argv[i], "test_plugin_path", 16))
+       {
+         if (i < (argc - 1))
+           vat_plugin_path = argv[++i];
+       }
       else if (!strncmp (argv[i], "heapsize", 8))
        {
          sizep = (u8 *) argv[i + 1];
@@ -304,7 +310,7 @@ heapsize_config (vlib_main_t * vm, unformat_input_t * input)
 VLIB_CONFIG_FUNCTION (heapsize_config, "heapsize");
 
 static clib_error_t *
-plugin_path_config (vlib_main_t * vm, unformat_input_t * input)
+dummy_path_config (vlib_main_t * vm, unformat_input_t * input)
 {
   u8 *junk;
 
@@ -322,8 +328,22 @@ plugin_path_config (vlib_main_t * vm, unformat_input_t * input)
   return 0;
 }
 
+static clib_error_t *
+plugin_path_config (vlib_main_t * vm, unformat_input_t * input)
+{
+  return dummy_path_config (vm, input);
+}
+
 VLIB_CONFIG_FUNCTION (plugin_path_config, "plugin_path");
 
+static clib_error_t *
+test_plugin_path_config (vlib_main_t * vm, unformat_input_t * input)
+{
+  return dummy_path_config (vm, input);
+}
+
+VLIB_CONFIG_FUNCTION (test_plugin_path_config, "test_plugin_path");
+
 void vl_msg_api_post_mortem_dump (void);
 void elog_post_mortem_dump (void);
 
@@ -395,6 +415,87 @@ vlib_app_num_thread_stacks_needed (void)
  * messages!
  */
 
+#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"))
+    verbose = 1;
+
+  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;
+       }
+    }
+
+  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;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (show_bihash_command, static) =
+{
+  .path = "show bihash",
+  .short_help = "show bihash",
+  .function = show_bihash_command_fn,
+};
+/* *INDENT-ON* */
+
 /*
  * fd.io coding-style-patch-verification: ON
  *