Fix issue with cpu_id and numa_code captured too early

[vpp.git] / src / vlib / main.c

diff --git a/src/vlib/main.c b/src/vlib/main.c
index 3048a0d..cfd2385 100644 (file)
--- a/src/vlib/main.c
+++ b/src/vlib/main.c
@@ -1696,6 +1696,12 @@ vlib_main_or_worker_loop (vlib_main_t * vm, int is_main)
     {
       vlib_node_runtime_t *n;
 
+      if (PREDICT_FALSE (vm->cpu_id != clib_get_current_cpu_id ()))
+       {
+         vm->cpu_id = clib_get_current_cpu_id ();
+         vm->numa_node = clib_get_current_numa_node ();
+       }
+
       if (PREDICT_FALSE (_vec_len (vm->pending_rpc_requests) > 0))
        {
          if (!is_main)