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/vnet/fib/fib.c | 14 ++++++-------- src/vnet/fib/fib_bfd.c | 14 +++++++------- 2 files changed, 13 insertions(+), 15 deletions(-) (limited to 'src/vnet/fib') diff --git a/src/vnet/fib/fib.c b/src/vnet/fib/fib.c index 413f93e893c..28e18dded23 100644 --- a/src/vnet/fib/fib.c +++ b/src/vnet/fib/fib.c @@ -22,13 +22,6 @@ static clib_error_t * fib_module_init (vlib_main_t * vm) { - clib_error_t * error; - - if ((error = vlib_call_init_function (vm, dpo_module_init))) - return (error); - if ((error = vlib_call_init_function (vm, adj_module_init))) - return (error); - fib_entry_module_init(); fib_entry_src_module_init(); fib_path_module_init(); @@ -38,4 +31,9 @@ fib_module_init (vlib_main_t * vm) return (NULL); } -VLIB_INIT_FUNCTION (fib_module_init); +/* *INDENT-OFF* */ +VLIB_INIT_FUNCTION (fib_module_init) = +{ + .runs_after = VLIB_INITS("dpo_module_init", "adj_module_init"), +}; +/* *INDENT-ON* */ diff --git a/src/vnet/fib/fib_bfd.c b/src/vnet/fib/fib_bfd.c index ae7ceec1a6b..f785ba2e68f 100644 --- a/src/vnet/fib/fib_bfd.c +++ b/src/vnet/fib/fib_bfd.c @@ -183,14 +183,14 @@ fib_bfd_notify (bfd_listen_event_e event, static clib_error_t * fib_bfd_main_init (vlib_main_t * vm) { - clib_error_t * error = NULL; - - if ((error = vlib_call_init_function (vm, bfd_main_init))) - return (error); - bfd_register_listener(fib_bfd_notify); - return (error); + return (NULL); } -VLIB_INIT_FUNCTION (fib_bfd_main_init); +/* *INDENT-OFF* */ +VLIB_INIT_FUNCTION (fib_bfd_main_init) = +{ + .runs_after = VLIB_INITS("bfd_main_init"), +}; +/* *INDENT-ON* */ -- cgit 1.2.3-korg