Use thread local storage for thread index

[vpp.git] / src / vnet / map / ip6_map_t.c

diff --git a/src/vnet/map/ip6_map_t.c b/src/vnet/map/ip6_map_t.c
index eb3996c..9915167 100644 (file)
--- a/src/vnet/map/ip6_map_t.c
+++ b/src/vnet/map/ip6_map_t.c
@@ -448,7 +448,7 @@ ip6_map_t_icmp (vlib_main_t * vm,
   n_left_from = frame->n_vectors;
   next_index = node->cached_next_index;
   vlib_combined_counter_main_t *cm = map_main.domain_counters;
-  u32 cpu_index = os_get_cpu_number ();
+  u32 thread_index = vlib_get_thread_index ();
 
   while (n_left_from > 0)
     {
@@ -493,7 +493,7 @@ ip6_map_t_icmp (vlib_main_t * vm,
          if (PREDICT_TRUE (error0 == MAP_ERROR_NONE))
            {
              vlib_increment_combined_counter (cm + MAP_DOMAIN_COUNTER_RX,
-                                              cpu_index,
+                                              thread_index,
                                               vnet_buffer (p0)->
                                               map_t.map_domain_index, 1,
                                               len0);
@@ -1051,7 +1051,7 @@ ip6_map_t (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame)
   vlib_node_runtime_t *error_node =
     vlib_node_get_runtime (vm, ip6_map_t_node.index);
   vlib_combined_counter_main_t *cm = map_main.domain_counters;
-  u32 cpu_index = os_get_cpu_number ();
+  u32 thread_index = vlib_get_thread_index ();
 
   from = vlib_frame_vector_args (frame);
   n_left_from = frame->n_vectors;
@@ -1218,7 +1218,7 @@ ip6_map_t (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame)
              (error0 == MAP_ERROR_NONE && next0 != IP6_MAPT_NEXT_MAPT_ICMP))
            {
              vlib_increment_combined_counter (cm + MAP_DOMAIN_COUNTER_RX,
-                                              cpu_index,
+                                              thread_index,
                                               vnet_buffer (p0)->
                                               map_t.map_domain_index, 1,
                                               clib_net_to_host_u16
@@ -1229,7 +1229,7 @@ ip6_map_t (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame)
              (error1 == MAP_ERROR_NONE && next1 != IP6_MAPT_NEXT_MAPT_ICMP))
            {
              vlib_increment_combined_counter (cm + MAP_DOMAIN_COUNTER_RX,
-                                              cpu_index,
+                                              thread_index,
                                               vnet_buffer (p1)->
                                               map_t.map_domain_index, 1,
                                               clib_net_to_host_u16
@@ -1403,7 +1403,7 @@ ip6_map_t (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame)
              (error0 == MAP_ERROR_NONE && next0 != IP6_MAPT_NEXT_MAPT_ICMP))
            {
              vlib_increment_combined_counter (cm + MAP_DOMAIN_COUNTER_RX,
-                                              cpu_index,
+                                              thread_index,
                                               vnet_buffer (p0)->
                                               map_t.map_domain_index, 1,
                                               clib_net_to_host_u16