feature: Add packet trace API

[vpp.git] / src / vat / main.c

diff --git a/src/vat/main.c b/src/vat/main.c
index 996fb1e..3e63aea 100644 (file)
--- a/src/vat/main.c
+++ b/src/vat/main.c
@@ -42,15 +42,31 @@ connect_to_vpe (char *name)
   return 0;
 }
 
+/* *INDENT-OFF* */
+
+
 vlib_main_t vlib_global_main;
-vlib_main_t **vlib_mains;
+
+static struct
+{
+  vec_header_t h;
+  vlib_main_t *vm;
+} __attribute__ ((packed)) __bootstrap_vlib_main_vector
+__attribute__ ((aligned (CLIB_CACHE_LINE_BYTES))) =
+{
+  .h.len = 1,
+  .vm = &vlib_global_main,
+};
+/* *INDENT-ON* */
+
+vlib_main_t **vlib_mains = &__bootstrap_vlib_main_vector.vm;
+
 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 +124,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)
        {
@@ -208,14 +226,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 +284,7 @@ setup_signal_handlers (void)
        case SIGSTOP:
        case SIGUSR1:
        case SIGUSR2:
+       case SIGPROF:
          continue;
 
          /* ignore SIGPIPE, SIGCHLD */
@@ -315,6 +334,65 @@ vat_find_plugin_path ()
   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)
+{
+  clib_error_t *error = 0;
+  _vlib_init_function_list_elt_t *i;
+
+#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 (vm->init_functions_called, i->f))
+       {
+         if (call_once)
+           hash_set1 (vm->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)
+{
+  return call_init_exit_functions_internal (vm, headp, call_once,
+                                           1 /* do_sort */ );
+}
+
 int
 main (int argc, char **argv)
 {
@@ -328,6 +406,8 @@ main (int argc, char **argv)
   u8 json_output = 0;
   int i;
   f64 timeout;
+  clib_error_t *error;
+  vlib_main_t *vm = &vlib_global_main;
 
   clib_mem_init_thread_safe (0, 128 << 20);
 
@@ -419,9 +499,27 @@ main (int argc, char **argv)
 
   vec_validate (vam->inbuf, 4096);
 
+  load_features ();
+
   vam->current_file = (u8 *) "plugin-init";
   vat_plugin_init (vam);
 
+  /* Set up the init function hash table */
+  vm->init_functions_called = hash_create (0, 0);
+
+  /* Execute plugin init and api_init functions */
+  error = vlib_call_init_exit_functions
+    (vm, &vm->init_function_registrations, 1 /* call once */ );
+
+  if (error)
+    clib_error_report (error);
+
+  error = vlib_call_init_exit_functions
+    (vm, &vm->api_init_function_registrations, 1 /* call_once */ );
+
+  if (error)
+    clib_error_report (error);
+
   for (i = 0; i < vec_len (input_files); i++)
     {
       vam->ifp = fopen ((char *) input_files[i], "r");