diff options
| author |   Damjan Marion <damarion@cisco.com> | 2017-03-16 11:32:09 +0100 |
|---|---|---|
| committer |   Dave Barach <openvpp@barachs.net> | 2017-03-16 13:06:27 +0000 |
| commit | e9f929b52ddb741ec1e4cb2d92c6be1e798933a0 (patch) | |
| tree | 1843d4798292dbd17d27ad3fab3c833388eaaf62 /src/vnet/gre/node.c | |
| parent | 3cc4971882235a539bc6177e8e4b4d92129b3a12 (diff) | |
vlib: make runtime_data thread-local
Change-Id: I4aa3e7e42fb81211de1aed07dc7befee87a1e18b
Signed-off-by: Damjan Marion <damarion@cisco.com>
Diffstat (limited to 'src/vnet/gre/node.c')
| -rw-r--r-- | src/vnet/gre/node.c | 26 |
1 files changed, 21 insertions, 5 deletions
diff --git a/src/vnet/gre/node.c b/src/vnet/gre/node.c index 86f7a6eeea4..dd16db5e9fc 100644 --- a/src/vnet/gre/node.c +++ b/src/vnet/gre/node.c @@ -448,7 +448,6 @@ gre_register_input_protocol (vlib_main_t * vm, { gre_main_t * em = &gre_main; gre_protocol_info_t * pi; - gre_input_runtime_t * rt; u16 * n; { @@ -464,10 +463,13 @@ gre_register_input_protocol (vlib_main_t * vm, node_index); /* Setup gre protocol -> next index sparse vector mapping. */ - rt = vlib_node_get_runtime_data (vm, gre_input_node.index); - n = sparse_vec_validate (rt->next_by_protocol, - clib_host_to_net_u16 (protocol)); - n[0] = pi->next_index; + foreach_vlib_main ({ + gre_input_runtime_t * rt; + rt = vlib_node_get_runtime_data (this_vlib_main, gre_input_node.index); + n = sparse_vec_validate (rt->next_by_protocol, + clib_host_to_net_u16 (protocol)); + n[0] = pi->next_index; + }); } static void @@ -529,3 +531,17 @@ static clib_error_t * gre_input_init (vlib_main_t * vm) } VLIB_INIT_FUNCTION (gre_input_init); + +static clib_error_t * gre_input_worker_init (vlib_main_t * vm) +{ + gre_input_runtime_t * rt; + + rt = vlib_node_get_runtime_data (vm, gre_input_node.index); + + rt->next_by_protocol = sparse_vec_new + (/* elt bytes */ sizeof (rt->next_by_protocol[0]), + /* bits in index */ BITS (((gre_header_t *) 0)->protocol)); + return 0; +} + +VLIB_WORKER_INIT_FUNCTION (gre_input_worker_init); |