From dfa0cc95fbd91a248fceda09a875364b48c5791d Mon Sep 17 00:00:00 2001 From: Damjan Marion Date: Thu, 17 Apr 2025 22:11:45 +0200 Subject: [PATCH] vlib: remove unused variable Type: improvement Change-Id: I9a268e7687ebc78e36ef65666749e402b273695a Signed-off-by: Damjan Marion --- src/vlib/main.c | 4 +++- src/vlib/main.h | 1 - src/vlib/unix/input.c | 6 ------ 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/src/vlib/main.c b/src/vlib/main.c index 6391e287b53..ee8126b1000 100644 --- a/src/vlib/main.c +++ b/src/vlib/main.c @@ -1514,7 +1514,6 @@ vlib_main_or_worker_loop (vlib_main_t * vm, int is_main) if (!nm->interrupt_threshold_vector_length) nm->interrupt_threshold_vector_length = 5; - vm->cpu_id = clib_get_current_cpu_id (); vm->numa_node = clib_get_current_numa_node (); os_set_numa_index (vm->numa_node); @@ -1902,6 +1901,8 @@ vlib_main (vlib_main_t * volatile vm, unformat_input_t * input) if (!vgm->name) vgm->name = "VLIB"; + vm->numa_node = clib_get_current_numa_node (); + if ((error = vlib_physmem_init (vm))) { clib_error_report (error); @@ -2065,6 +2066,7 @@ vlib_worker_thread_fn (void *arg) clib_error_t *e; ASSERT (vm->thread_index == vlib_get_thread_index ()); + vm->numa_node = clib_get_current_numa_node (); vlib_worker_thread_init (w); clib_time_init (&vm->clib_time); diff --git a/src/vlib/main.h b/src/vlib/main.h index 2a4ec839ec5..aa7e1dbaf84 100644 --- a/src/vlib/main.h +++ b/src/vlib/main.h @@ -205,7 +205,6 @@ typedef struct vlib_main_t /* thread, cpu and numa_node indices */ u32 thread_index; - u32 cpu_id; u32 numa_node; /* control-plane API queue signal pending, length indication */ diff --git a/src/vlib/unix/input.c b/src/vlib/unix/input.c index 4bc4c8208ed..a6e88f028d4 100644 --- a/src/vlib/unix/input.c +++ b/src/vlib/unix/input.c @@ -355,12 +355,6 @@ linux_epoll_input_inline (vlib_main_t * vm, vlib_node_runtime_t * node, } done: - 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 (); - } - return 0; } -- 2.16.6