init / exit function ordering

[vpp.git] / src / examples / vlib / main_stub.c

diff --git a/src/examples/vlib/main_stub.c b/src/examples/vlib/main_stub.c
index 4d74bd7..3735055 100644 (file)
--- a/src/examples/vlib/main_stub.c
+++ b/src/examples/vlib/main_stub.c
@@ -25,19 +25,17 @@ main (int argc, char *argv[])
 static clib_error_t *
 main_stub_init (vlib_main_t * vm)
 {
-  clib_error_t *error;
-
-  if ((error =
-       unix_physmem_init (vm, /* fail_if_physical_memory_not_present */ 0)))
-    return error;
-
-  if ((error = vlib_call_init_function (vm, unix_cli_init)))
-    return error;
+  clib_error_t *error = 0;
 
   return error;
 }
 
-VLIB_INIT_FUNCTION (main_stub_init);
+/* *INDENT-OFF* */
+VLIB_INIT_FUNCTION (main_stub_init) =
+{
+  .runs_after = VLIB_INITS("unix_physmem_init", "unix_cli_init"),
+};
+/* *INDENT-ON* */
 
 #if 0
 /* Node test code. */
@@ -51,7 +49,7 @@ static u8 *
 format_my_node_frame (u8 * s, va_list * va)
 {
   vlib_frame_t *f = va_arg (*va, vlib_frame_t *);
-  my_frame_t *g = vlib_frame_args (f);
+  my_frame_t *g = vlib_frame_scalar_args (f);
   int i;
 
   s = format (s, "scalar %d, vector { ", g->scalar);
@@ -83,7 +81,7 @@ my_func (vlib_main_t * vm, vlib_node_runtime_t * rt, vlib_frame_t * f)
     {
       vlib_frame_t *next = vlib_get_next_frame (vm, rt, /* next index */ 0);
       n_left = VLIB_FRAME_SIZE - next->n_vectors;
-      y = vlib_frame_args (next);
+      y = vlib_frame_scalar_args (next);
       y->scalar = serial++;
     }
   else