diff options
| author |   Damjan Marion <damarion@cisco.com> | 2021-03-06 12:26:28 +0100 |
|---|---|---|
| committer | Damjan Marion <damarion@cisco.com> | 2021-03-26 16:33:42 +0100 |
| commit | fd8deb48c7ad63b47c5d7465ceefcadef0316f93 (patch) | |
| tree | 3e5f319c7c57f526a6e571fd96847563bedf2706 /src/vpp | |
| parent | f553a2cbbb8cca84ebf033335ebd2cd26dc19d69 (diff) | |
vlib: split vlib_main_t into global and per-thread
Type: refactor
Change-Id: I8b273bc3bf16aa360f031f1b2692f766e5fc4613
Signed-off-by: Damjan Marion <damarion@cisco.com>
Diffstat (limited to 'src/vpp')
| -rw-r--r-- | src/vpp/api/test_client.c | 2 | ||||
| -rw-r--r-- | src/vpp/api/test_ha.c | 3 | ||||
| -rw-r--r-- | src/vpp/stats/stat_segment.c | 5 | ||||
| -rw-r--r-- | src/vpp/vnet/main.c | 6 |
4 files changed, 4 insertions, 12 deletions
diff --git a/src/vpp/api/test_client.c b/src/vpp/api/test_client.c index 2d89d5c53c9..38afefa8601 100644 --- a/src/vpp/api/test_client.c +++ b/src/vpp/api/test_client.c @@ -86,8 +86,6 @@ test_main_t test_main; /* * Satisfy external references when -lvlib is not available. */ -vlib_main_t vlib_global_main; -vlib_main_t **vlib_mains; void vlib_cli_output (struct vlib_main_t *vm, char *fmt, ...) diff --git a/src/vpp/api/test_ha.c b/src/vpp/api/test_ha.c index 96cbfbe3899..0cc1074031e 100644 --- a/src/vpp/api/test_ha.c +++ b/src/vpp/api/test_ha.c @@ -94,9 +94,6 @@ static void vl_api_control_ping_reply_t_handler tm->pings_replied++; } -vlib_main_t vlib_global_main; -vlib_main_t **vlib_mains; - void vlib_cli_output (struct vlib_main_t *vm, char *fmt, ...) { diff --git a/src/vpp/stats/stat_segment.c b/src/vpp/stats/stat_segment.c index 722edb03348..5042ba842d9 100644 --- a/src/vpp/stats/stat_segment.c +++ b/src/vpp/stats/stat_segment.c @@ -590,9 +590,8 @@ update_node_counters (stat_segment_main_t * sm) } static void -do_stat_segment_updates (stat_segment_main_t * sm) +do_stat_segment_updates (vlib_main_t *vm, stat_segment_main_t *sm) { - vlib_main_t *vm = vlib_mains[0]; f64 vector_rate; u64 input_packets; f64 dt, now; @@ -761,7 +760,7 @@ stat_segment_collector_process (vlib_main_t * vm, vlib_node_runtime_t * rt, while (1) { - do_stat_segment_updates (sm); + do_stat_segment_updates (vm, sm); vlib_process_suspend (vm, sm->update_interval); } return 0; /* or not */ diff --git a/src/vpp/vnet/main.c b/src/vpp/vnet/main.c index 582ad5fdc31..bf1eb7a1d1d 100644 --- a/src/vpp/vnet/main.c +++ b/src/vpp/vnet/main.c @@ -106,7 +106,6 @@ int main (int argc, char *argv[]) { int i; - vlib_main_t *vm = &vlib_global_main; void vl_msg_api_set_first_available_msg_id (u16); uword main_heap_size = (1ULL << 30); u8 *sizep; @@ -332,9 +331,8 @@ defaulted: /* and use the main heap as that numa's numa heap */ clib_mem_set_per_numa_heap (main_heap); - - vm->init_functions_called = hash_create (0, /* value bytes */ 0); - vpe_main_init (vm); + vlib_main_init (); + vpe_main_init (vlib_get_first_main ()); return vlib_unix_main (argc, argv); } else |