X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvlib%2Funix%2Fmain.c;h=fd8a7e863a14075482414a3aaa2cd9e81d2d6a46;hb=c50bcbd6c28f2fd87f87b86bd5b215892daf46a6;hp=568876b2933a8602e7f476e92f1c8f00787bcb63;hpb=cea46522e79637f6ec37c03ec3fbeb87b160a378;p=vpp.git diff --git a/src/vlib/unix/main.c b/src/vlib/unix/main.c index 568876b2933..fd8a7e863a1 100644 --- a/src/vlib/unix/main.c +++ b/src/vlib/unix/main.c @@ -40,6 +40,7 @@ #include #include +#include #include #include #include @@ -93,8 +94,8 @@ unsetup_signal_handlers (int sig) dangerous to vec_resize it when crashing, mheap itself might have been corrupted already */ static u8 *syslog_msg = 0; -static int last_signum = 0; -static uword last_faulting_address = 0; +int vlib_last_signum = 0; +uword vlib_last_faulting_address = 0; static void unix_signal_handler (int signum, siginfo_t * si, ucontext_t * uc) @@ -102,8 +103,8 @@ unix_signal_handler (int signum, siginfo_t * si, ucontext_t * uc) uword fatal = 0; /* These come in handy when looking at core files from optimized images */ - last_signum = signum; - last_faulting_address = (uword) si->si_addr; + vlib_last_signum = signum; + vlib_last_faulting_address = (uword) si->si_addr; syslog_msg = format (syslog_msg, "received signal %U, PC %U", format_signal, signum, format_ucontext_pc, uc); @@ -180,8 +181,8 @@ unix_signal_handler (int signum, siginfo_t * si, ucontext_t * uc) /* have to remove SIGABRT to avoid recursive - os_exit calling abort() */ unsetup_signal_handlers (SIGABRT); - /* os_exit(1) causes core generation, do not do this for SIGINT */ - if (signum == SIGINT) + /* os_exit(1) causes core generation, skip that for SIGINT, SIGHUP */ + if (signum == SIGINT || signum == SIGHUP) os_exit (0); else os_exit (1); @@ -210,6 +211,7 @@ setup_signal_handlers (unix_main_t * um) { /* these signals take the default action */ case SIGKILL: + case SIGCONT: case SIGSTOP: case SIGUSR1: case SIGUSR2: @@ -246,14 +248,7 @@ unix_error_handler (void *arg, u8 * msg, int msg_len) } else { - char save = msg[msg_len - 1]; - - /* Null Terminate. */ - msg[msg_len - 1] = 0; - - syslog (LOG_ERR | LOG_DAEMON, "%s", msg); - - msg[msg_len - 1] = save; + syslog (LOG_ERR | LOG_DAEMON, "%.*s", msg_len, msg); } } @@ -266,20 +261,10 @@ vlib_unix_error_report (vlib_main_t * vm, clib_error_t * error) return; { - char save; - u8 *msg; - u32 msg_len; - - msg = error->what; - msg_len = vec_len (msg); - - /* Null Terminate. */ - save = msg[msg_len - 1]; - msg[msg_len - 1] = 0; - - syslog (LOG_ERR | LOG_DAEMON, "%s", msg); - - msg[msg_len - 1] = save; + u8 *msg = error->what; + u32 len = vec_len (msg); + int msg_len = (len > INT_MAX) ? INT_MAX : len; + syslog (LOG_ERR | LOG_DAEMON, "%.*s", msg_len, msg); } } @@ -331,7 +316,7 @@ startup_config_process (vlib_main_t * vm, n = read (fd, buf + l, 4096); if (n > 0) { - _vec_len (buf) = l + n; + vec_set_len (buf, l + n); if (n < 4096) break; } @@ -362,8 +347,20 @@ startup_config_process (vlib_main_t * vm, if (vec_len (buf)) { + unformat_input_t in; unformat_init_vector (&sub_input, buf); - vlib_cli_input (vm, &sub_input, 0, 0); + + while (unformat_user (&sub_input, unformat_vlib_cli_line, &in)) + { + if (vlib_cli_input (vm, &in, 0, 0) != 0) + { + /* cli failed - stop */ + unformat_free (&in); + break; + } + unformat_free (&in); + } + /* frees buf for us */ unformat_free (&sub_input); } @@ -384,6 +381,7 @@ VLIB_REGISTER_NODE (startup_config_node,static) = { static clib_error_t * unix_config (vlib_main_t * vm, unformat_input_t * input) { + vlib_global_main_t *vgm = vlib_get_global_main (); unix_main_t *um = &unix_main; clib_error_t *error = 0; gid_t gid; @@ -402,6 +400,10 @@ unix_config (vlib_main_t * vm, unformat_input_t * input) um->flags |= UNIX_FLAG_NODAEMON; else if (unformat (input, "nosyslog")) um->flags |= UNIX_FLAG_NOSYSLOG; + else if (unformat (input, "nocolor")) + um->flags |= UNIX_FLAG_NOCOLOR; + else if (unformat (input, "nobanner")) + um->flags |= UNIX_FLAG_NOBANNER; else if (unformat (input, "cli-prompt %s", &cli_prompt)) vlib_unix_cli_set_prompt (cli_prompt); else @@ -533,7 +535,7 @@ unix_config (vlib_main_t * vm, unformat_input_t * input) if (!(um->flags & (UNIX_FLAG_INTERACTIVE | UNIX_FLAG_NOSYSLOG))) { - openlog (vm->name, LOG_CONS | LOG_PERROR | LOG_PID, LOG_DAEMON); + openlog (vgm->name, LOG_CONS | LOG_PERROR | LOG_PID, LOG_DAEMON); clib_error_register_handler (unix_error_handler, um); if (!(um->flags & UNIX_FLAG_NODAEMON) && daemon ( /* chdir to / */ 0, @@ -576,6 +578,12 @@ unix_config (vlib_main_t * vm, unformat_input_t * input) * when invoking VPP applications from a process monitor which * pipe stdout/stderr to a dedicated logger service. * + * @cfgcmd{nocolor} + * Do not use colors in outputs. + * * + * @cfgcmd{nobanner} + * Do not display startup banner. + * * @cfgcmd{exec, <filename>} * @par startup-config <filename> * Read startup operational configuration from @c filename. @@ -651,12 +659,13 @@ static uword thread0 (uword arg) { vlib_main_t *vm = (vlib_main_t *) arg; + vlib_global_main_t *vgm = vlib_get_global_main (); unformat_input_t input; int i; vlib_process_finish_switch_stack (vm); - unformat_init_command_line (&input, (char **) vm->argv); + unformat_init_command_line (&input, (char **) vgm->argv); i = vlib_main (vm, &input); unformat_free (&input); @@ -666,38 +675,60 @@ thread0 (uword arg) u8 * vlib_thread_stack_init (uword thread_index) { + void *stack; ASSERT (thread_index < vec_len (vlib_thread_stacks)); - vlib_thread_stacks[thread_index] = clib_mem_alloc_aligned - (VLIB_THREAD_STACK_SIZE, clib_mem_get_page_size ()); + stack = clib_mem_vm_map_stack (VLIB_THREAD_STACK_SIZE, + CLIB_MEM_PAGE_SZ_DEFAULT, + "thread stack: thread %u", thread_index); - /* - * Disallow writes to the bottom page of the stack, to - * catch stack overflows. - */ - if (mprotect (vlib_thread_stacks[thread_index], - clib_mem_get_page_size (), PROT_READ) < 0) - clib_unix_warning ("thread stack"); - return vlib_thread_stacks[thread_index]; + if (stack == CLIB_MEM_VM_MAP_FAILED) + clib_panic ("failed to allocate thread %u stack", thread_index); + + vlib_thread_stacks[thread_index] = stack; + return stack; } +#ifndef PATH_MAX +#define PATH_MAX 4096 +#endif + int vlib_unix_main (int argc, char *argv[]) { - vlib_main_t *vm = &vlib_global_main; /* one and only time for this! */ + vlib_global_main_t *vgm = vlib_get_global_main (); + vlib_main_t *vm = vlib_get_first_main (); /* one and only time for this! */ unformat_input_t input; clib_error_t *e; + char buffer[PATH_MAX]; int i; - vm->argv = (u8 **) argv; - vm->name = argv[0]; - vm->heap_base = clib_mem_get_heap (); - vm->heap_aligned_base = (void *) - (((uword) vm->heap_base) & ~(VLIB_FRAME_ALIGN - 1)); - ASSERT (vm->heap_base); + vec_validate_aligned (vgm->vlib_mains, 0, CLIB_CACHE_LINE_BYTES); + + if ((i = readlink ("/proc/self/exe", buffer, sizeof (buffer) - 1)) > 0) + { + int j; + buffer[i] = 0; + vgm->exec_path = vec_new (char, i + 1); + clib_memcpy_fast (vgm->exec_path, buffer, i + 1); + for (j = i - 1; j > 0; j--) + if (buffer[j - 1] == '/') + break; + vgm->name = vec_new (char, i - j + 1); + clib_memcpy_fast (vgm->name, buffer + j, i - j + 1); + } + else + vgm->exec_path = vgm->name = argv[0]; + + vgm->argv = (u8 **) argv; clib_time_init (&vm->clib_time); - unformat_init_command_line (&input, (char **) vm->argv); + /* Turn on the event logger at the first possible moment */ + vgm->configured_elog_ring_size = 128 << 10; + elog_init (vlib_get_elog_main (), vgm->configured_elog_ring_size); + elog_enable_disable (vlib_get_elog_main (), 1); + + unformat_init_command_line (&input, (char **) vgm->argv); if ((e = vlib_plugin_config (vm, &input))) { clib_error_report (e); @@ -709,9 +740,9 @@ vlib_unix_main (int argc, char *argv[]) if (i) return i; - unformat_init_command_line (&input, (char **) vm->argv); - if (vm->init_functions_called == 0) - vm->init_functions_called = hash_create (0, /* value bytes */ 0); + unformat_init_command_line (&input, (char **) vgm->argv); + if (vgm->init_functions_called == 0) + vgm->init_functions_called = hash_create (0, /* value bytes */ 0); e = vlib_call_all_config_functions (vm, &input, 1 /* early */ ); if (e != 0) { @@ -721,7 +752,7 @@ vlib_unix_main (int argc, char *argv[]) unformat_free (&input); /* always load symbols, for signal handler and mheap memory get/put backtrace */ - clib_elf_main_init (vm->name); + clib_elf_main_init (vgm->exec_path); vec_validate (vlib_thread_stacks, 0); vlib_thread_stack_init (0);