X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvat%2Fmain.c;h=e7c08184de3936c3613b723a52cfd65c4b3786b3;hb=8bea589cfe0fca1a6f560e16ca66a4cf199041a2;hp=1bad2ebb14d263b8dd26dfd6f3273173be3f4d51;hpb=0c6fb530287de2a28ec1c9df5410f87b65323f9d;p=vpp.git diff --git a/src/vat/main.c b/src/vat/main.c index 1bad2ebb14d..e7c08184de3 100644 --- a/src/vat/main.c +++ b/src/vat/main.c @@ -13,8 +13,10 @@ * limitations under the License. */ #include "vat.h" +#include #include "plugin.h" #include +#include vat_main_t vat_main; @@ -26,22 +28,11 @@ vat_suspend (vlib_main_t * vm, f64 interval) /* do nothing in the standalone version, just return */ } -void -fformat_append_cr (FILE * ofp, const char *fmt, ...) -{ - va_list va; - - va_start (va, fmt); - (void) va_fformat (ofp, (char *) fmt, &va); - va_end (va); - fformat (ofp, "\n"); -} - int connect_to_vpe (char *name) { vat_main_t *vam = &vat_main; - api_main_t *am = &api_main; + api_main_t *am = vlibapi_get_main (); if (vl_client_connect_to_vlib ("/vpe-api", name, 32) < 0) return -1; @@ -52,15 +43,16 @@ connect_to_vpe (char *name) return 0; } -vlib_main_t vlib_global_main; -vlib_main_t **vlib_mains; +/* *INDENT-OFF* */ + +vlib_global_main_t vlib_global_main; + void vlib_cli_output (struct vlib_main_t *vm, char *fmt, ...) { clib_warning ("BUG"); } - static u8 * format_api_error (u8 * s, va_list * args) { @@ -106,7 +98,7 @@ do_one_file (vat_main_t * vam) rv = write (1, "exec# ", 6); } - _vec_len (vam->inbuf) = 4096; + vec_set_len (vam->inbuf, 4096); if (vam->do_exit || fgets ((char *) vam->inbuf, vec_len (vam->inbuf), vam->ifp) == 0) @@ -117,8 +109,10 @@ do_one_file (vat_main_t * vam) vec_free (this_cmd); this_cmd = - (u8 *) clib_macro_eval (&vam->macro_main, (char *) vam->inbuf, - 1 /* complain */ ); + (u8 *) clib_macro_eval (&vam->macro_main, (i8 *) vam->inbuf, + 1 /* complain */ , + 0 /* level */ , + 8 /* max_level */ ); if (vam->exec_mode == 0) { @@ -188,7 +182,18 @@ do_one_file (vat_main_t * vam) if (vam->regenerate_interface_table) { vam->regenerate_interface_table = 0; - api_sw_interface_dump (vam); + vam->api_sw_interface_dump (vam); + } + + /* Hack to pick up new client index after memfd_segment_create pivot */ + if (vam->client_index_invalid) + { + vat_main_t *vam = &vat_main; + api_main_t *am = vlibapi_get_main (); + + vam->vl_input_queue = am->shmem_hdr->vl_input_queue; + vam->my_client_index = am->my_client_index; + vam->client_index_invalid = 0; } } } @@ -207,14 +212,14 @@ init_error_string_table (vat_main_t * vam) } static i8 * -eval_current_file (macro_main_t * mm, i32 complain) +eval_current_file (clib_macro_main_t * mm, i32 complain) { vat_main_t *vam = &vat_main; return ((i8 *) format (0, "%s%c", vam->current_file, 0)); } static i8 * -eval_current_line (macro_main_t * mm, i32 complain) +eval_current_line (clib_macro_main_t * mm, i32 complain) { vat_main_t *vam = &vat_main; return ((i8 *) format (0, "%d%c", vam->input_line_number, 0)); @@ -253,7 +258,7 @@ setup_signal_handlers (void) for (i = 1; i < 32; i++) { - memset (&sa, 0, sizeof (sa)); + clib_memset (&sa, 0, sizeof (sa)); sa.sa_sigaction = (void *) signal_handler; sa.sa_flags = SA_SIGINFO; @@ -262,14 +267,17 @@ setup_signal_handlers (void) /* these signals take the default action */ case SIGABRT: case SIGKILL: + case SIGCONT: case SIGSTOP: case SIGUSR1: case SIGUSR2: + case SIGPROF: continue; /* ignore SIGPIPE, SIGCHLD */ case SIGPIPE: case SIGCHLD: + case SIGWINCH: sa.sa_sigaction = (void *) SIG_IGN; break; @@ -283,9 +291,125 @@ setup_signal_handlers (void) } } +static void +vat_find_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/" CLIB_LIB_DIR "/vpp_api_test_plugins", path, path); + vec_add1 (s, 0); + vat_plugin_path = (char *) s; +} + +static void +load_features (void) +{ + vat_registered_features_t *f; + vat_main_t *vam = &vat_main; + clib_error_t *error; + + f = vam->feature_function_registrations; + + while (f) + { + error = f->function (vam); + if (error) + { + clib_warning ("INIT FAILED"); + } + f = f->next; + } +} + +static inline clib_error_t * +call_init_exit_functions_internal (vlib_main_t *vm, + _vlib_init_function_list_elt_t **headp, + int call_once, int do_sort, int is_global) +{ + vlib_global_main_t *vgm = vlib_get_global_main (); + clib_error_t *error = 0; + _vlib_init_function_list_elt_t *i; + + ASSERT (is_global == 1); + +#if 0 + /* Not worth copying the topological sort code */ + if (do_sort && (error = vlib_sort_init_exit_functions (headp))) + return (error); +#endif + + i = *headp; + while (i) + { + if (call_once && !hash_get (vgm->init_functions_called, i->f)) + { + if (call_once) + hash_set1 (vgm->init_functions_called, i->f); + error = i->f (vm); + if (error) + return error; + } + i = i->next_init_function; + } + return error; +} + +clib_error_t * +vlib_call_init_exit_functions (vlib_main_t *vm, + _vlib_init_function_list_elt_t **headp, + int call_once, int is_global) +{ + return call_init_exit_functions_internal (vm, headp, call_once, + 1 /* do_sort */, is_global); +} + +static void +vat_register_interface_dump (vat_main_t *vam) +{ + void *handle; + plugin_info_t *pi; + + vec_foreach (pi, vat_plugin_main.plugin_info) + { + handle = dlsym (pi->handle, "api_sw_interface_dump"); + if (handle) + { + vam->api_sw_interface_dump = handle; + break; + } + } + + if (!vam->api_sw_interface_dump) + { + fformat (stderr, + "sw_interface_dump not found in interface_test plugin!\n"); + exit (1); + } +} + int main (int argc, char **argv) { + vlib_global_main_t *vgm = vlib_get_global_main (); vat_main_t *vam = &vat_main; unformat_input_t _argv, *a = &_argv; u8 **input_files = 0; @@ -294,17 +418,14 @@ main (int argc, char **argv) u8 *this_input_file; u8 interactive = 1; u8 json_output = 0; - u8 *heap; - mheap_t *h; int i; + f64 timeout; + clib_error_t *error; + vlib_main_t *vm; - clib_mem_init (0, 128 << 20); - - heap = clib_mem_get_per_cpu_heap (); - h = mheap_header (heap); - - /* make the main heap thread-safe */ - h->flags |= MHEAP_FLAG_THREAD_SAFE; + clib_mem_init_thread_safe (0, 128 << 20); + vlib_main_init (); + vm = vlib_get_first_main (); clib_macro_init (&vam->macro_main); clib_macro_add_builtin (&vam->macro_main, "current_file", @@ -313,6 +434,10 @@ main (int argc, char **argv) eval_current_line); init_error_string_table (vam); + vec_validate (vam->cmd_reply, 0); + vec_reset_length (vam->cmd_reply); + + vat_find_plugin_path (); unformat_init_command_line (a, argv); @@ -326,6 +451,12 @@ main (int argc, char **argv) interactive = 0; else if (unformat (a, "json")) json_output = 1; + else if (unformat (a, "socket-name %s", &vam->socket_name)) + ; + else if (unformat (a, "default-socket")) + { + vam->socket_name = format (0, "%s%c", API_SOCKET_FILE, 0); + } else if (unformat (a, "plugin_path %s", (u8 *) & vat_plugin_path)) vec_add1 (vat_plugin_path, 0); else if (unformat (a, "plugin_name_filter %s", @@ -337,9 +468,12 @@ main (int argc, char **argv) } else { - fformat (stderr, - "%s: usage [in ... in ] [out ] [script] [json]\n", - argv[0]); + fformat + (stderr, + "%s: usage [in ... in ] [out ] [script] [json]\n" + "[plugin_path ][default-socket][socket-name ]\n" + "[plugin_name_filter ][chroot prefix ]\n", + argv[0]); exit (1); } } @@ -363,7 +497,11 @@ main (int argc, char **argv) setup_signal_handlers (); - if (connect_to_vpe ("vpp_api_test") < 0) + if (vam->socket_name && vat_socket_connect (vam)) + fformat (stderr, "WARNING: socket connection failed"); + + if ((!vam->socket_client_main || vam->socket_client_main->socket_fd == 0) + && connect_to_vpe ("vpp_api_test") < 0) { svm_region_exit (); fformat (stderr, "Couldn't connect to vpe, exiting...\n"); @@ -372,16 +510,35 @@ main (int argc, char **argv) vam->json_output = json_output; - if (!json_output) - { - api_sw_interface_dump (vam); - } - vec_validate (vam->inbuf, 4096); + load_features (); + vam->current_file = (u8 *) "plugin-init"; vat_plugin_init (vam); + vat_register_interface_dump (vam); + + if (!json_output) + vam->api_sw_interface_dump (vam); + + /* Set up the init function hash table */ + vgm->init_functions_called = hash_create (0, 0); + + /* Execute plugin init and api_init functions */ + error = vlib_call_init_exit_functions (vm, &vgm->init_function_registrations, + 1 /* call once */, 1 /* is_global*/); + + if (error) + clib_error_report (error); + + error = + vlib_call_init_exit_functions (vm, &vgm->api_init_function_registrations, + 1 /* call_once */, 1 /* is_global */); + + if (error) + clib_error_report (error); + for (i = 0; i < vec_len (input_files); i++) { vam->ifp = fopen ((char *) input_files[i], "r"); @@ -408,6 +565,18 @@ main (int argc, char **argv) fclose (vam->ifp); } + /* + * Particularly when running a script, don't be in a hurry to leave. + * A reply message queued to this process will end up constipating + * the allocation rings. + */ + timeout = vat_time_now (vam) + 2.0; + while (vam->result_ready == 0 && vat_time_now (vam) < timeout) + ; + + if (vat_time_now (vam) > timeout) + clib_warning ("BUG: message reply spin-wait timeout"); + vl_client_disconnect_from_vlib (); exit (0); }