Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Use thread local storage for thread index
[vpp.git]
/
src
/
vnet
/
vxlan
/
decap.c
diff --git
a/src/vnet/vxlan/decap.c
b/src/vnet/vxlan/decap.c
index
d5a9442
..
2acb1f6
100644
(file)
--- a/
src/vnet/vxlan/decap.c
+++ b/
src/vnet/vxlan/decap.c
@@
-81,7
+81,7
@@
vxlan_input (vlib_main_t * vm,
vxlan4_tunnel_key_t last_key4;
vxlan6_tunnel_key_t last_key6;
u32 pkts_decapsulated = 0;
vxlan4_tunnel_key_t last_key4;
vxlan6_tunnel_key_t last_key6;
u32 pkts_decapsulated = 0;
- u32
cpu_index = os_get_cpu_number
();
+ u32
thread_index = vlib_get_thread_index
();
u32 stats_sw_if_index, stats_n_packets, stats_n_bytes;
if (is_ip4)
u32 stats_sw_if_index, stats_n_packets, stats_n_bytes;
if (is_ip4)
@@
-314,7
+314,7
@@
vxlan_input (vlib_main_t * vm,
if (stats_n_packets)
vlib_increment_combined_counter
(im->combined_sw_if_counters + VNET_INTERFACE_COUNTER_RX,
if (stats_n_packets)
vlib_increment_combined_counter
(im->combined_sw_if_counters + VNET_INTERFACE_COUNTER_RX,
-
cpu
_index, stats_sw_if_index,
+
thread
_index, stats_sw_if_index,
stats_n_packets, stats_n_bytes);
stats_n_packets = 1;
stats_n_bytes = len0;
stats_n_packets, stats_n_bytes);
stats_n_packets = 1;
stats_n_bytes = len0;
@@
-468,7
+468,7
@@
vxlan_input (vlib_main_t * vm,
if (stats_n_packets)
vlib_increment_combined_counter
(im->combined_sw_if_counters + VNET_INTERFACE_COUNTER_RX,
if (stats_n_packets)
vlib_increment_combined_counter
(im->combined_sw_if_counters + VNET_INTERFACE_COUNTER_RX,
-
cpu
_index, stats_sw_if_index,
+
thread
_index, stats_sw_if_index,
stats_n_packets, stats_n_bytes);
stats_n_packets = 1;
stats_n_bytes = len1;
stats_n_packets, stats_n_bytes);
stats_n_packets = 1;
stats_n_bytes = len1;
@@
-674,7
+674,7
@@
vxlan_input (vlib_main_t * vm,
if (stats_n_packets)
vlib_increment_combined_counter
(im->combined_sw_if_counters + VNET_INTERFACE_COUNTER_RX,
if (stats_n_packets)
vlib_increment_combined_counter
(im->combined_sw_if_counters + VNET_INTERFACE_COUNTER_RX,
-
cpu
_index, stats_sw_if_index,
+
thread
_index, stats_sw_if_index,
stats_n_packets, stats_n_bytes);
stats_n_packets = 1;
stats_n_bytes = len0;
stats_n_packets, stats_n_bytes);
stats_n_packets = 1;
stats_n_bytes = len0;
@@
-711,7
+711,7
@@
vxlan_input (vlib_main_t * vm,
{
vlib_increment_combined_counter
(im->combined_sw_if_counters + VNET_INTERFACE_COUNTER_RX,
{
vlib_increment_combined_counter
(im->combined_sw_if_counters + VNET_INTERFACE_COUNTER_RX,
-
cpu
_index, stats_sw_if_index, stats_n_packets, stats_n_bytes);
+
thread
_index, stats_sw_if_index, stats_n_packets, stats_n_bytes);
node->runtime_data[0] = stats_sw_if_index;
}
node->runtime_data[0] = stats_sw_if_index;
}
@@
-1032,8
+1032,8
@@
ip_vxlan_bypass_inline (vlib_main_t * vm,
}
else
{
}
else
{
- error1 = good_udp1 ? 0 : IP
4
_ERROR_UDP_CHECKSUM;
- error1 = (len_diff1 >= 0) ? error1 : IP
4
_ERROR_UDP_LENGTH;
+ error1 = good_udp1 ? 0 : IP
6
_ERROR_UDP_CHECKSUM;
+ error1 = (len_diff1 >= 0) ? error1 : IP
6
_ERROR_UDP_LENGTH;
}
next1 = error1 ?
}
next1 = error1 ?