X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvat%2Fmain.c;h=70352e6bf952e87d186865f5861e3947b771b0d3;hb=4de12b9c62757f7297c6ac5c7eedff17082f4ee8;hp=a5421140fb33dd30a14da9ed3ce97088b68697fd;hpb=4d2f86a1ebcfc952080386603354c4767d2c8825;p=vpp.git

diff --git a/src/vat/main.c b/src/vat/main.c
index a5421140fb3..70352e6bf95 100644
--- a/src/vat/main.c
+++ b/src/vat/main.c
@@ -31,7 +31,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 +42,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 +109,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)
 	{
@@ -185,7 +188,7 @@ do_one_file (vat_main_t * vam)
       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 +211,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,11 +269,13 @@ setup_signal_handlers (void)
 	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;
 
@@ -287,7 +292,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;
@@ -315,9 +319,72 @@ 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, 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);
+}
+
 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;
@@ -328,8 +395,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",
@@ -419,9 +490,28 @@ 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 */
+  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");