diff options
| author |   Damjan Marion <damarion@cisco.com> | 2021-03-26 13:06:13 +0100 |
|---|---|---|
| committer | Damjan Marion <damarion@cisco.com> | 2021-03-26 16:33:21 +0100 |
| commit | 6ffb7c61899eb782416cbd2f117042a583f189f7 (patch) | |
| tree | f6bd132d53b0aded6b235d13200dba2864afc7d8 /src/vnet/session | |
| parent | 83f13e45bcd4b1018aa29bb6f32324c32f3a11a8 (diff) | |
vlib: introduce vlib_get_main_by_index(), vlib_get_n_threads()
Type: improvement
Change-Id: If3da7d4338470912f37ff1794620418d928fb77f
Signed-off-by: Damjan Marion <damarion@cisco.com>
Diffstat (limited to 'src/vnet/session')
| -rw-r--r-- | src/vnet/session/application.c | 2 | ||||
| -rw-r--r-- | src/vnet/session/session.c | 2 | ||||
| -rw-r--r-- | src/vnet/session/session_debug.c | 2 | ||||
| -rw-r--r-- | src/vnet/session/session_node.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/src/vnet/session/application.c b/src/vnet/session/application.c index 906a73e9d79..eb8a7169d8a 100644 --- a/src/vnet/session/application.c +++ b/src/vnet/session/application.c @@ -1553,7 +1553,7 @@ appliction_format_all_app_mq (vlib_main_t * vm) application_t *app; int i, n_threads; - n_threads = vec_len (vlib_mains); + n_threads = vlib_get_n_threads (); for (i = 0; i < n_threads; i++) { diff --git a/src/vnet/session/session.c b/src/vnet/session/session.c index b7c1702dcf4..469ec0ed529 100644 --- a/src/vnet/session/session.c +++ b/src/vnet/session/session.c @@ -1689,7 +1689,7 @@ session_manager_main_enable (vlib_main_t * vm) wrk->ctrl_head = clib_llist_make_head (wrk->event_elts, evt_list); wrk->new_head = clib_llist_make_head (wrk->event_elts, evt_list); wrk->old_head = clib_llist_make_head (wrk->event_elts, evt_list); - wrk->vm = vlib_mains[i]; + wrk->vm = vlib_get_main_by_index (i); wrk->last_vlib_time = vlib_time_now (vm); wrk->last_vlib_us_time = wrk->last_vlib_time * CLIB_US_TIME_FREQ; vec_validate (wrk->session_to_enqueue, smm->last_transport_proto_type); diff --git a/src/vnet/session/session_debug.c b/src/vnet/session/session_debug.c index c042e9e53db..349d1ec9b46 100644 --- a/src/vnet/session/session_debug.c +++ b/src/vnet/session/session_debug.c @@ -120,7 +120,7 @@ session_debug_init (void) void dump_thread_0_event_queue (void) { - vlib_main_t *vm = &vlib_global_main; + vlib_main_t *vm = vlib_get_first_main (); u32 my_thread_index = vm->thread_index; session_event_t _e, *e = &_e; svm_msg_q_shared_queue_t *sq; diff --git a/src/vnet/session/session_node.c b/src/vnet/session/session_node.c index 7ceb9ea1f10..ccf93cbbf61 100644 --- a/src/vnet/session/session_node.c +++ b/src/vnet/session/session_node.c @@ -1534,7 +1534,7 @@ VLIB_REGISTER_NODE (session_queue_node) = static clib_error_t * session_queue_exit (vlib_main_t * vm) { - if (vec_len (vlib_mains) < 2) + if (vlib_get_n_threads () < 2) return 0; /* |