X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvpp%2Fvnet%2Fmain.c;h=5100d5c79b83f14399066066016ccf3e917480d0;hb=refs%2Fchanges%2F38%2F19438%2F3;hp=ade32aa1b78134f7fb8e3d5ed48e9739339ee911;hpb=814813103bb4acb9ced39c22972bd5e97df13d33;p=vpp.git diff --git a/src/vpp/vnet/main.c b/src/vpp/vnet/main.c index ade32aa1b78..5100d5c79b8 100644 --- a/src/vpp/vnet/main.c +++ b/src/vpp/vnet/main.c @@ -13,6 +13,10 @@ * limitations under the License. */ +#define _GNU_SOURCE +#include +#include + #include #include #include @@ -20,7 +24,50 @@ #include #include #include +#include +/* + * Load plugins from /usr/lib/vpp_plugins by default + */ +char *vlib_plugin_path = NULL; +char *vlib_plugin_app_version = VPP_BUILD_VER; +char *vat_plugin_path = NULL; + +static void +vpp_find_plugin_path () +{ + extern char *vat_plugin_path; + char *p, path[PATH_MAX]; + int rv; + u8 *s; + + /* find executable path */ + if ((rv = readlink ("/proc/self/exe", path, PATH_MAX - 1)) == -1) + return; + + /* readlink doesn't provide null termination */ + path[rv] = 0; + + /* strip filename */ + if ((p = strrchr (path, '/')) == 0) + return; + *p = 0; + + /* strip bin/ */ + if ((p = strrchr (path, '/')) == 0) + return; + *p = 0; + + 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/" CLIB_TARGET_TRIPLET "/vpp_api_test_plugins:" + "%s/lib/vpp_api_test_plugins", path, path); + vec_add1 (s, 0); + vat_plugin_path = (char *) s; +} static void vpe_main_init (vlib_main_t * vm) @@ -39,13 +86,15 @@ vpe_main_init (vlib_main_t * vm) * Create the binary api plugin hashes before loading plugins */ vat_plugin_hash_create (); + + if (!vlib_plugin_path) + vpp_find_plugin_path (); } /* - * Load plugins from /usr/lib/vpp_plugins by default + * Default path for runtime data */ -char *vlib_plugin_path = "/usr/lib/vpp_plugins"; -char *vlib_plugin_app_version = VPP_BUILD_VER; +char *vlib_default_runtime_dir = "vpp"; int main (int argc, char *argv[]) @@ -56,6 +105,8 @@ main (int argc, char *argv[]) uword main_heap_size = (1ULL << 30); u8 *sizep; u32 size; + int main_core = 1; + cpu_set_t cpuset; #if __x86_64__ CLIB_UNUSED (const char *msg) @@ -108,10 +159,17 @@ main (int argc, char *argv[]) } 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) @@ -162,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]; @@ -187,15 +250,30 @@ main (int argc, char *argv[]) else if (*sizep == 'm' || *sizep == 'M') main_heap_size <<= 20; } + else if (!strncmp (argv[i], "main-core", 9)) + { + if (i < (argc - 1)) + { + errno = 0; + unsigned long x = strtol (argv[++i], 0, 0); + if (errno == 0) + main_core = x; + } + } } defaulted: + /* set process affinity for main thread */ + CPU_ZERO (&cpuset); + CPU_SET (main_core, &cpuset); + pthread_setaffinity_np (pthread_self (), sizeof (cpu_set_t), &cpuset); + /* Set up the plugin message ID allocator right now... */ vl_msg_api_set_first_available_msg_id (VL_MSG_FIRST_AVAILABLE); /* Allocate main heap */ - if (clib_mem_init (0, main_heap_size)) + if (clib_mem_init_thread_safe (0, main_heap_size)) { vm->init_functions_called = hash_create (0, /* value bytes */ 0); vpe_main_init (vm); @@ -232,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; @@ -250,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); @@ -289,6 +381,14 @@ os_exit (int code) exit (code); } +#ifdef BARRIER_TRACING +void +vl_msg_api_barrier_trace_context (const char *context) +{ + vlib_worker_threads[0].barrier_context = context; +} +#endif + void vl_msg_api_barrier_sync (void) { @@ -315,36 +415,6 @@ vlib_app_num_thread_stacks_needed (void) * messages! */ -#if CLIB_DEBUG > 0 - -static clib_error_t * -test_crash_command_fn (vlib_main_t * vm, - unformat_input_t * input, vlib_cli_command_t * cmd) -{ - u64 *p = (u64 *) 0xdefec8ed; - - ELOG_TYPE_DECLARE (e) = - { - .format = "deliberate crash: touching %x",.format_args = "i4",}; - - elog (&vm->elog_main, &e, 0xdefec8ed); - - *p = 0xdeadbeef; - - /* Not so much... */ - return 0; -} - -/* *INDENT-OFF* */ -VLIB_CLI_COMMAND (test_crash_command, static) = { - .path = "test crash", - .short_help = "crash the bus!", - .function = test_crash_command_fn, -}; -/* *INDENT-ON* */ - -#endif - /* * fd.io coding-style-patch-verification: ON *