#include <vppinfra/cpu.h>
#include <vlib/vlib.h>
#include <vlib/unix/unix.h>
+#include <vlib/threads.h>
#include <vnet/plugin/plugin.h>
#include <vnet/ethernet/ethernet.h>
#include <vpp/app/version.h>
/*
* Load plugins from /usr/lib/vpp_plugins by default
*/
-char *vlib_plugin_path = "/usr/lib/vpp_plugins";
+char *vlib_plugin_path = NULL;
char *vlib_plugin_app_version = VPP_BUILD_VER;
+char *vat_plugin_path = NULL;
static void
vpp_find_plugin_path ()
return;
*p = 0;
- s = format (0, "%s/lib/vpp_plugins", path);
-#if uword_bits == 64
- s = format (s, ":%s/lib64/vpp_plugins", path);
-#endif
+ s = format (0, "%s/lib/" CLIB_TARGET_TRIPLET "/vpp_plugins:"
+ "%s/lib/vpp_plugins", path, path);
vec_add1 (s, 0);
vlib_plugin_path = (char *) s;
- s = format (0, "%s/lib/vpp_api_test_plugins", path);
-#if uword_bits == 64
- s = format (s, ":%s/lib64/vpp_api_test_plugins", path);
-#endif
+ s = format (0, "%s/lib/" CLIB_TARGET_TRIPLET "/vpp_api_test_plugins:"
+ "%s/lib/vpp_api_test_plugins", path, path);
vec_add1 (s, 0);
vat_plugin_path = (char *) s;
}
*/
vat_plugin_hash_create ();
- vpp_find_plugin_path ();
+ if (!vlib_plugin_path)
+ vpp_find_plugin_path ();
}
/*
u32 size;
int main_core = 1;
cpu_set_t cpuset;
+ void *main_heap;
#if __x86_64__
CLIB_UNUSED (const char *msg)
}
argv_ = calloc (1, sizeof (char *));
if (argv_ == NULL)
- return 1;
+ {
+ fclose (fp);
+ return 1;
+ }
arg = strndup (argv[0], 1024);
if (arg == NULL)
- return 1;
+ {
+ fclose (fp);
+ free (argv_);
+ return 1;
+ }
argv_[0] = arg;
while (1)
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];
vl_msg_api_set_first_available_msg_id (VL_MSG_FIRST_AVAILABLE);
/* Allocate main heap */
- if (clib_mem_init (0, main_heap_size))
+ if ((main_heap = clib_mem_init_thread_safe (0, main_heap_size)))
{
+ vlib_worker_thread_t tmp;
+
+ /* Figure out which numa runs the main thread */
+ vlib_get_thread_core_numa (&tmp, main_core);
+ __os_numa_index = tmp.numa_id;
+
+ /* and use the main heap as that numa's numa heap */
+ clib_mem_set_per_numa_heap (main_heap);
+
vm->init_functions_called = hash_create (0, /* value bytes */ 0);
vpe_main_init (vm);
return vlib_unix_main (argc, argv);
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;
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);
* messages!
*/
-#if CLIB_DEBUG > 0
+#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 *
-test_crash_command_fn (vlib_main_t * vm,
- unformat_input_t * input, vlib_cli_command_t * cmd)
+show_bihash_command_fn (vlib_main_t * vm,
+ unformat_input_t * input, vlib_cli_command_t * cmd)
{
- u64 *p = (u64 *) 0xdefec8ed;
+ 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;
+ }
+ }
- ELOG_TYPE_DECLARE (e) =
- {
- .format = "deliberate crash: touching %x",.format_args = "i4",};
+ vec_sort_with_function (names, name_sort_cmp);
- elog (&vm->elog_main, &e, 0xdefec8ed);
+ vlib_cli_output (vm, "%-30s %8s %s", "Name", "Actual", "Configured");
- *p = 0xdeadbeef;
+ 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);
+ }
- /* Not so much... */
+ 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 (test_crash_command, static) = {
- .path = "test crash",
- .short_help = "crash the bus!",
- .function = test_crash_command_fn,
+VLIB_CLI_COMMAND (show_bihash_command, static) =
+{
+ .path = "show bihash",
+ .short_help = "show bihash",
+ .function = show_bihash_command_fn,
};
/* *INDENT-ON* */
-#endif
+#ifdef CLIB_SANITIZE_ADDR
+/* default options for Address Sanitizer */
+const char *
+__asan_default_options (void)
+{
+ return "unmap_shadow_on_exit=1:disable_coredump=0:abort_on_error=1";
+}
+#endif /* CLIB_SANITIZE_ADDR */
/*
* fd.io coding-style-patch-verification: ON