From 09c0946e91b4810c8450fe0962b2085506fbda25 Mon Sep 17 00:00:00 2001 From: Dave Barach Date: Tue, 28 Apr 2020 18:00:21 -0400 Subject: vlib: add ASSERT to vlib_time_now(...) Calling vlib_time_now (&vlib_global_main) from a worker thread is a bad mistake. ASSERT (vm->thread_index == __os_thread_index) will catch it. Type: fix Signed-off-by: Dave Barach Change-Id: I55af6de84e06143f8f43adc62103b77267a7a441 (cherry picked from commit 77d98382824ca211fb55fcf842931930ccfb3baa) --- src/vnet/session/session.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/vnet/session/session.c') diff --git a/src/vnet/session/session.c b/src/vnet/session/session.c index 16863f03dc4..c6e64544623 100644 --- a/src/vnet/session/session.c +++ b/src/vnet/session/session.c @@ -1518,7 +1518,7 @@ session_manager_main_enable (vlib_main_t * vm) 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->last_vlib_time = vlib_time_now (vlib_mains[i]); + wrk->last_vlib_time = vlib_time_now (vm); wrk->last_vlib_us_time = wrk->last_vlib_time * CLIB_US_TIME_FREQ; if (num_threads > 1) -- cgit 1.2.3-korg