Use thread local storage for thread index

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

diff --git a/src/vnet/map/ip4_map.c b/src/vnet/map/ip4_map.c
index 2be9ad3..e39b6f1 100644 (file)
--- a/src/vnet/map/ip4_map.c
+++ b/src/vnet/map/ip4_map.c
@@ -248,7 +248,7 @@ ip4_map (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame)
   next_index = node->cached_next_index;
   map_main_t *mm = &map_main;
   vlib_combined_counter_main_t *cm = mm->domain_counters;
-  u32 cpu_index = os_get_cpu_number ();
+  u32 thread_index = vlib_get_thread_index ();
 
   while (n_left_from > 0)
     {
@@ -293,12 +293,10 @@ ip4_map (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame)
          p1 = vlib_get_buffer (vm, pi1);
          ip40 = vlib_buffer_get_current (p0);
          ip41 = vlib_buffer_get_current (p1);
-         d0 =
-           ip4_map_get_domain (vnet_buffer (p0)->ip.adj_index[VLIB_TX],
-                               &map_domain_index0);
-         d1 =
-           ip4_map_get_domain (vnet_buffer (p1)->ip.adj_index[VLIB_TX],
-                               &map_domain_index1);
+         map_domain_index0 = vnet_buffer (p0)->ip.adj_index[VLIB_TX];
+         d0 = ip4_map_get_domain (map_domain_index0);
+         map_domain_index1 = vnet_buffer (p1)->ip.adj_index[VLIB_TX];
+         d1 = ip4_map_get_domain (map_domain_index1);
          ASSERT (d0);
          ASSERT (d1);
 
@@ -379,7 +377,7 @@ ip4_map (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame)
                                               ip40) ?
                    IP4_MAP_NEXT_IP6_REWRITE : next0;
                  vlib_increment_combined_counter (cm + MAP_DOMAIN_COUNTER_TX,
-                                                  cpu_index,
+                                                  thread_index,
                                                   map_domain_index0, 1,
                                                   clib_net_to_host_u16
                                                   (ip6h0->payload_length) +
@@ -411,7 +409,7 @@ ip4_map (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame)
                                               ip41) ?
                    IP4_MAP_NEXT_IP6_REWRITE : next1;
                  vlib_increment_combined_counter (cm + MAP_DOMAIN_COUNTER_TX,
-                                                  cpu_index,
+                                                  thread_index,
                                                   map_domain_index1, 1,
                                                   clib_net_to_host_u16
                                                   (ip6h1->payload_length) +
@@ -464,9 +462,8 @@ ip4_map (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame)
 
          p0 = vlib_get_buffer (vm, pi0);
          ip40 = vlib_buffer_get_current (p0);
-         d0 =
-           ip4_map_get_domain (vnet_buffer (p0)->ip.adj_index[VLIB_TX],
-                               &map_domain_index0);
+         map_domain_index0 = vnet_buffer (p0)->ip.adj_index[VLIB_TX];
+         d0 = ip4_map_get_domain (map_domain_index0);
          ASSERT (d0);
 
          /*
@@ -523,7 +520,7 @@ ip4_map (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame)
                                               ip40) ?
                    IP4_MAP_NEXT_IP6_REWRITE : next0;
                  vlib_increment_combined_counter (cm + MAP_DOMAIN_COUNTER_TX,
-                                                  cpu_index,
+                                                  thread_index,
                                                   map_domain_index0, 1,
                                                   clib_net_to_host_u16
                                                   (ip6h0->payload_length) +
@@ -567,7 +564,7 @@ ip4_map_reass (vlib_main_t * vm,
   next_index = node->cached_next_index;
   map_main_t *mm = &map_main;
   vlib_combined_counter_main_t *cm = mm->domain_counters;
-  u32 cpu_index = os_get_cpu_number ();
+  u32 thread_index = vlib_get_thread_index ();
   u32 *fragments_to_drop = NULL;
   u32 *fragments_to_loopback = NULL;
 
@@ -597,9 +594,8 @@ ip4_map_reass (vlib_main_t * vm,
          p0 = vlib_get_buffer (vm, pi0);
          ip60 = vlib_buffer_get_current (p0);
          ip40 = (ip4_header_t *) (ip60 + 1);
-         d0 =
-           ip4_map_get_domain (vnet_buffer (p0)->ip.adj_index[VLIB_TX],
-                               &map_domain_index0);
+         map_domain_index0 = vnet_buffer (p0)->ip.adj_index[VLIB_TX];
+         d0 = ip4_map_get_domain (map_domain_index0);
 
          map_ip4_reass_lock ();
          map_ip4_reass_t *r = map_ip4_reass_get (ip40->src_address.as_u32,
@@ -698,8 +694,8 @@ ip4_map_reass (vlib_main_t * vm,
            {
              if (error0 == MAP_ERROR_NONE)
                vlib_increment_combined_counter (cm + MAP_DOMAIN_COUNTER_TX,
-                                                cpu_index, map_domain_index0,
-                                                1,
+                                                thread_index,
+                                                map_domain_index0, 1,
                                                 clib_net_to_host_u16
                                                 (ip60->payload_length) + 40);
              next0 =