X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvat%2Fmain.c;h=d052493495da8c8a1ce4da3603e3afaf7130e007;hb=ea25722b3855926f74c33270cbf822ab30ae8ce6;hp=92edec117b271e568e3bc97754414fe5bb0fce2d;hpb=7d3161adb56833e84c07eec4284b840255b5e3de;p=vpp.git diff --git a/src/vat/main.c b/src/vat/main.c index 92edec117b2..d052493495d 100644 --- a/src/vat/main.c +++ b/src/vat/main.c @@ -13,6 +13,7 @@ * limitations under the License. */ #include "vat.h" +#include #include "plugin.h" #include #include @@ -31,7 +32,7 @@ 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; @@ -42,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) { @@ -108,7 +110,9 @@ do_one_file (vat_main_t * vam) this_cmd = (u8 *) clib_macro_eval (&vam->macro_main, (i8 *) vam->inbuf, - 1 /* complain */ ); + 1 /* complain */ , + 0 /* level */ , + 8 /* max_level */ ); if (vam->exec_mode == 0) { @@ -178,14 +182,14 @@ 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 = &api_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; @@ -208,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)); @@ -266,6 +270,7 @@ setup_signal_handlers (void) case SIGSTOP: case SIGUSR1: case SIGUSR2: + case SIGPROF: continue; /* ignore SIGPIPE, SIGCHLD */ @@ -288,7 +293,6 @@ setup_signal_handlers (void) static void vat_find_plugin_path () { - extern char *vat_plugin_path; char *p, path[PATH_MAX]; int rv; u8 *s; @@ -310,15 +314,101 @@ vat_find_plugin_path () return; *p = 0; - s = format (0, "%s/lib/" CLIB_TARGET_TRIPLET "/vpp_api_test_plugins:" - "%s/lib/vpp_api_test_plugins", path, path); + 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; @@ -329,8 +419,12 @@ main (int argc, char **argv) u8 json_output = 0; int i; f64 timeout; + clib_error_t *error; + vlib_main_t *vm; 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", @@ -415,14 +509,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");