diff options
| author |   Damjan Marion <damarion@cisco.com> | 2018-04-05 21:32:29 +0200 |
|---|---|---|
| committer |   Dave Barach <openvpp@barachs.net> | 2018-04-09 16:06:20 +0000 |
| commit | 72d2c4f3718ba5293e9e0fa8726406ee7d9f3940 (patch) | |
| tree | 799a61d776b35e640bf2542148bcca946b926dca /src/vlib/init.h | |
| parent | f13a8787365300d757eca4624c8f8a6b7c49392b (diff) | |
plugins: unload plugin if early init fails
Change-Id: I32f68e2ee8f5d32962acdefb0193583f71d342b3
Signed-off-by: Damjan Marion <damarion@cisco.com>
Diffstat (limited to 'src/vlib/init.h')
| -rw-r--r-- | src/vlib/init.h | 63 |
1 files changed, 63 insertions, 0 deletions
diff --git a/src/vlib/init.h b/src/vlib/init.h index 12db3f90b96..1eddbb13d5a 100644 --- a/src/vlib/init.h +++ b/src/vlib/init.h @@ -79,6 +79,25 @@ typedef struct vlib_config_function_runtime_t char name[32]; } vlib_config_function_runtime_t; +#define VLIB_REMOVE_FROM_LINKED_LIST(first,p,next) \ +{ \ + if (first == p) \ + first = (p)->next; \ + else \ + { \ + __typeof__ (p) current = first; \ + while (current->next) \ + { \ + if (current->next == p) \ + { \ + current->next = current->next->next; \ + break; \ + } \ + current = current->next; \ + } \ + } \ +} + #define _VLIB_INIT_FUNCTION_SYMBOL(x, type) \ _vlib_##type##_function_##x @@ -106,6 +125,30 @@ static void __vlib_add_##tag##_function_##x (void) \ = vm->tag##_function_registrations; \ vm->tag##_function_registrations = &_vlib_init_function; \ _vlib_init_function.f = &x; \ +} \ +static void __vlib_rm_##tag##_function_##x (void) \ + __attribute__((__destructor__)) ; \ +static void __vlib_rm_##tag##_function_##x (void) \ +{ \ + vlib_main_t * vm = vlib_get_main(); \ + _vlib_init_function_list_elt_t *next; \ + if (vm->tag##_function_registrations->f == &x) \ + { \ + vm->tag##_function_registrations = \ + vm->tag##_function_registrations->next_init_function; \ + return; \ + } \ + next = vm->tag##_function_registrations; \ + while (next->next_init_function) \ + { \ + if (next->next_init_function->f == &x) \ + { \ + next->next_init_function = \ + next->next_init_function->next_init_function; \ + return; \ + } \ + next = next->next_init_function; \ + } \ } #define VLIB_INIT_FUNCTION(x) VLIB_DECLARE_INIT_FUNCTION(x,init) @@ -129,6 +172,16 @@ static void __vlib_add_config_function_##x (void) \ vm->config_function_registrations \ = &VLIB_CONFIG_FUNCTION_SYMBOL(x); \ } \ +static void __vlib_rm_config_function_##x (void) \ + __attribute__((__destructor__)) ; \ +static void __vlib_rm_config_function_##x (void) \ +{ \ + vlib_main_t * vm = vlib_get_main(); \ + vlib_config_function_runtime_t *p = \ + & VLIB_CONFIG_FUNCTION_SYMBOL (x); \ + VLIB_REMOVE_FROM_LINKED_LIST \ + (vm->config_function_registrations, p, next_registration);\ +} \ vlib_config_function_runtime_t \ VLIB_CONFIG_FUNCTION_SYMBOL (x) \ = { \ @@ -150,6 +203,16 @@ static void __vlib_add_config_function_##x (void) \ vm->config_function_registrations \ = &VLIB_CONFIG_FUNCTION_SYMBOL(x); \ } \ +static void __vlib_rm_config_function_##x (void) \ + __attribute__((__destructor__)) ; \ +static void __vlib_rm_config_function_##x (void) \ +{ \ + vlib_main_t * vm = vlib_get_main(); \ + vlib_config_function_runtime_t *p = \ + & VLIB_CONFIG_FUNCTION_SYMBOL (x); \ + VLIB_REMOVE_FROM_LINKED_LIST \ + (vm->config_function_registrations, p, next_registration);\ +} \ vlib_config_function_runtime_t \ VLIB_CONFIG_FUNCTION_SYMBOL (x) \ = { \ |