Use thread local storage for thread index

[vpp.git] / src / vnet / dpo / lookup_dpo.c

diff --git a/src/vnet/dpo/lookup_dpo.c b/src/vnet/dpo/lookup_dpo.c
index e94e871..97ad0a4 100644 (file)
--- a/src/vnet/dpo/lookup_dpo.c
+++ b/src/vnet/dpo/lookup_dpo.c
@@ -266,7 +266,7 @@ lookup_dpo_ip4_inline (vlib_main_t * vm,
                        int table_from_interface)
 {
     u32 n_left_from, next_index, * from, * to_next;
-    u32 cpu_index = os_get_cpu_number();
+    u32 thread_index = vlib_get_thread_index();
     vlib_combined_counter_main_t * cm = &load_balance_main.lbm_to_counters;
 
     from = vlib_frame_vector_args (from_frame);
@@ -407,10 +407,10 @@ lookup_dpo_ip4_inline (vlib_main_t * vm,
            vnet_buffer(b1)->ip.adj_index[VLIB_TX] = dpo1->dpoi_index;
 
            vlib_increment_combined_counter
-               (cm, cpu_index, lbi0, 1,
+               (cm, thread_index, lbi0, 1,
                 vlib_buffer_length_in_chain (vm, b0));
            vlib_increment_combined_counter
-               (cm, cpu_index, lbi1, 1,
+               (cm, thread_index, lbi1, 1,
                 vlib_buffer_length_in_chain (vm, b1));
 
            if (PREDICT_FALSE(b0->flags & VLIB_BUFFER_IS_TRACED))
@@ -511,7 +511,7 @@ lookup_dpo_ip4_inline (vlib_main_t * vm,
            vnet_buffer(b0)->ip.adj_index[VLIB_TX] = dpo0->dpoi_index;
 
            vlib_increment_combined_counter
-               (cm, cpu_index, lbi0, 1,
+               (cm, thread_index, lbi0, 1,
                 vlib_buffer_length_in_chain (vm, b0));
 
            if (PREDICT_FALSE(b0->flags & VLIB_BUFFER_IS_TRACED))
@@ -606,7 +606,7 @@ lookup_dpo_ip6_inline (vlib_main_t * vm,
 {
     vlib_combined_counter_main_t * cm = &load_balance_main.lbm_to_counters;
     u32 n_left_from, next_index, * from, * to_next;
-    u32 cpu_index = os_get_cpu_number();
+    u32 thread_index = vlib_get_thread_index();
 
     from = vlib_frame_vector_args (from_frame);
     n_left_from = from_frame->n_vectors;
@@ -749,10 +749,10 @@ lookup_dpo_ip6_inline (vlib_main_t * vm,
            vnet_buffer(b1)->ip.adj_index[VLIB_TX] = dpo1->dpoi_index;
 
            vlib_increment_combined_counter
-               (cm, cpu_index, lbi0, 1,
+               (cm, thread_index, lbi0, 1,
                 vlib_buffer_length_in_chain (vm, b0));
            vlib_increment_combined_counter
-               (cm, cpu_index, lbi1, 1,
+               (cm, thread_index, lbi1, 1,
                 vlib_buffer_length_in_chain (vm, b1));
 
            if (PREDICT_FALSE(b0->flags & VLIB_BUFFER_IS_TRACED))
@@ -853,7 +853,7 @@ lookup_dpo_ip6_inline (vlib_main_t * vm,
            vnet_buffer(b0)->ip.adj_index[VLIB_TX] = dpo0->dpoi_index;
 
            vlib_increment_combined_counter
-               (cm, cpu_index, lbi0, 1,
+               (cm, thread_index, lbi0, 1,
                 vlib_buffer_length_in_chain (vm, b0));
 
            if (PREDICT_FALSE(b0->flags & VLIB_BUFFER_IS_TRACED))
@@ -930,7 +930,7 @@ lookup_dpo_mpls_inline (vlib_main_t * vm,
                        int table_from_interface)
 {
     u32 n_left_from, next_index, * from, * to_next;
-    u32 cpu_index = os_get_cpu_number();
+    u32 thread_index = vlib_get_thread_index();
     vlib_combined_counter_main_t * cm = &load_balance_main.lbm_to_counters;
 
     from = vlib_frame_vector_args (from_frame);
@@ -994,7 +994,7 @@ lookup_dpo_mpls_inline (vlib_main_t * vm,
             vnet_buffer(b0)->ip.adj_index[VLIB_TX] = dpo0->dpoi_index;
 
             vlib_increment_combined_counter
-                (cm, cpu_index, lbi0, 1,
+                (cm, thread_index, lbi0, 1,
                  vlib_buffer_length_in_chain (vm, b0));
 
            if (PREDICT_FALSE(b0->flags & VLIB_BUFFER_IS_TRACED))