From f8d50682cd1245f6f5ce4c846ca6f1bdc11255a6 Mon Sep 17 00:00:00 2001 From: Dave Barach Date: Tue, 14 May 2019 18:01:44 -0400 Subject: init / exit function ordering The vlib init function subsystem now supports a mix of procedural and formally-specified ordering constraints. We should eliminate procedural knowledge wherever possible. The following schemes are *roughly* equivalent: static clib_error_t *init_runs_first (vlib_main_t *vm) { clib_error_t *error; ... do some stuff... if ((error = vlib_call_init_function (init_runs_next))) return error; ... } VLIB_INIT_FUNCTION (init_runs_first); and static clib_error_t *init_runs_first (vlib_main_t *vm) { ... do some stuff... } VLIB_INIT_FUNCTION (init_runs_first) = { .runs_before = VLIB_INITS("init_runs_next"), }; The first form will [most likely] call "init_runs_next" on the spot. The second form means that "init_runs_first" runs before "init_runs_next," possibly much earlier in the sequence. Please DO NOT construct sets of init functions where A before B actually means A *right before* B. It's not necessary - simply combine A and B - and it leads to hugely annoying debugging exercises when trying to switch from ad-hoc procedural ordering constraints to formal ordering constraints. Change-Id: I5e4353503bf43b4acb11a45fb33c79a5ade8426c Signed-off-by: Dave Barach --- src/plugins/nsh/nsh-md2-ioam/nsh_md2_ioam_trace.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'src/plugins/nsh') diff --git a/src/plugins/nsh/nsh-md2-ioam/nsh_md2_ioam_trace.c b/src/plugins/nsh/nsh-md2-ioam/nsh_md2_ioam_trace.c index bd56a6ab7b1..c40e89b52be 100644 --- a/src/plugins/nsh/nsh-md2-ioam/nsh_md2_ioam_trace.c +++ b/src/plugins/nsh/nsh-md2-ioam/nsh_md2_ioam_trace.c @@ -354,13 +354,6 @@ nsh_md2_ioam_trace_init (vlib_main_t * vm) { nsh_md2_ioam_trace_main_t *hm = &nsh_md2_ioam_trace_main; nsh_md2_ioam_main_t *gm = &nsh_md2_ioam_main; - clib_error_t *error; - - if ((error = vlib_call_init_function (vm, nsh_init))) - return (error); - - if ((error = vlib_call_init_function (vm, nsh_md2_ioam_init))) - return (error); hm->vlib_main = vm; hm->vnet_main = vnet_get_main (); @@ -384,7 +377,12 @@ nsh_md2_ioam_trace_init (vlib_main_t * vm) return (0); } -VLIB_INIT_FUNCTION (nsh_md2_ioam_trace_init); +/* *INDENT-OFF* */ +VLIB_INIT_FUNCTION (nsh_md2_ioam_trace_init) = +{ + .runs_after = VLIB_INITS ("nsh_init", "nsh_md2_ioam_init"), +}; +/* *INDENT-ON* */ int nsh_md2_ioam_trace_profile_cleanup (void) -- cgit 1.2.3-korg