diff options
author | Dave Barach <dave@barachs.net> | 2019-05-14 18:01:44 -0400 |
---|---|---|
committer | Florin Coras <florin.coras@gmail.com> | 2019-05-16 16:11:23 +0000 |
commit | f8d50682cd1245f6f5ce4c846ca6f1bdc11255a6 (patch) | |
tree | 8ecc60e4715db88bdbc8ea6bd0170fbae6f645eb /src/vnet/classify | |
parent | c1f93067ed4b9954bbba82e2c9c104b22e2f7f33 (diff) |
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 <dave@barachs.net>
Diffstat (limited to 'src/vnet/classify')
-rw-r--r-- | src/vnet/classify/in_out_acl.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/vnet/classify/in_out_acl.c b/src/vnet/classify/in_out_acl.c index 553c353b7ae..7f5a926212c 100644 --- a/src/vnet/classify/in_out_acl.c +++ b/src/vnet/classify/in_out_acl.c @@ -251,10 +251,6 @@ clib_error_t * in_out_acl_init (vlib_main_t * vm) { in_out_acl_main_t *am = &in_out_acl_main; - clib_error_t *error = 0; - - if ((error = vlib_call_init_function (vm, ip_in_out_acl_init))) - return error; am->vlib_main = vm; am->vnet_main = vnet_get_main (); @@ -262,8 +258,12 @@ in_out_acl_init (vlib_main_t * vm) return 0; } - -VLIB_INIT_FUNCTION (in_out_acl_init); +/* *INDENT-OFF* */ +VLIB_INIT_FUNCTION (in_out_acl_init) = +{ + .runs_after = VLIB_INITS("ip_in_out_acl_init"), +}; +/* *INDENT-ON* */ uword unformat_acl_type (unformat_input_t * input, va_list * args) |