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-gpe
/
encap.c
diff --git
a/src/vnet/vxlan-gpe/encap.c
b/src/vnet/vxlan-gpe/encap.c
index
3a486e5
..
67ed94b
100644
(file)
--- a/
src/vnet/vxlan-gpe/encap.c
+++ b/
src/vnet/vxlan-gpe/encap.c
@@
-151,7
+151,7
@@
vxlan_gpe_encap (vlib_main_t * vm,
vnet_main_t * vnm = ngm->vnet_main;
vnet_interface_main_t * im = &vnm->interface_main;
u32 pkts_encapsulated = 0;
vnet_main_t * vnm = ngm->vnet_main;
vnet_interface_main_t * im = &vnm->interface_main;
u32 pkts_encapsulated = 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;
from = vlib_frame_vector_args (from_frame);
u32 stats_sw_if_index, stats_n_packets, stats_n_bytes;
from = vlib_frame_vector_args (from_frame);
@@
-253,7
+253,7
@@
vxlan_gpe_encap (vlib_main_t * vm,
if (stats_n_packets)
vlib_increment_combined_counter (
im->combined_sw_if_counters + VNET_INTERFACE_COUNTER_TX,
if (stats_n_packets)
vlib_increment_combined_counter (
im->combined_sw_if_counters + VNET_INTERFACE_COUNTER_TX,
-
cpu
_index, stats_sw_if_index, stats_n_packets, stats_n_bytes);
+
thread
_index, stats_sw_if_index, stats_n_packets, stats_n_bytes);
stats_sw_if_index = sw_if_index0;
stats_n_packets = 2;
stats_n_bytes = len0 + len1;
stats_sw_if_index = sw_if_index0;
stats_n_packets = 2;
stats_n_bytes = len0 + len1;
@@
-262,10
+262,10
@@
vxlan_gpe_encap (vlib_main_t * vm,
{
vlib_increment_combined_counter (
im->combined_sw_if_counters + VNET_INTERFACE_COUNTER_TX,
{
vlib_increment_combined_counter (
im->combined_sw_if_counters + VNET_INTERFACE_COUNTER_TX,
-
cpu
_index, sw_if_index0, 1, len0);
+
thread
_index, sw_if_index0, 1, len0);
vlib_increment_combined_counter (
im->combined_sw_if_counters + VNET_INTERFACE_COUNTER_TX,
vlib_increment_combined_counter (
im->combined_sw_if_counters + VNET_INTERFACE_COUNTER_TX,
-
cpu
_index, sw_if_index1, 1, len1);
+
thread
_index, sw_if_index1, 1, len1);
}
}
}
}
@@
-335,7
+335,7
@@
vxlan_gpe_encap (vlib_main_t * vm,
if (stats_n_packets)
vlib_increment_combined_counter (
im->combined_sw_if_counters + VNET_INTERFACE_COUNTER_TX,
if (stats_n_packets)
vlib_increment_combined_counter (
im->combined_sw_if_counters + VNET_INTERFACE_COUNTER_TX,
-
cpu
_index, stats_sw_if_index, stats_n_packets, stats_n_bytes);
+
thread
_index, stats_sw_if_index, stats_n_packets, stats_n_bytes);
stats_n_packets = 1;
stats_n_bytes = len0;
stats_sw_if_index = sw_if_index0;
stats_n_packets = 1;
stats_n_bytes = len0;
stats_sw_if_index = sw_if_index0;
@@
-359,7
+359,7
@@
vxlan_gpe_encap (vlib_main_t * vm,
if (stats_n_packets)
{
vlib_increment_combined_counter (
if (stats_n_packets)
{
vlib_increment_combined_counter (
- im->combined_sw_if_counters + VNET_INTERFACE_COUNTER_TX,
cpu
_index,
+ im->combined_sw_if_counters + VNET_INTERFACE_COUNTER_TX,
thread
_index,
stats_sw_if_index, stats_n_packets, stats_n_bytes);
node->runtime_data[0] = stats_sw_if_index;
}
stats_sw_if_index, stats_n_packets, stats_n_bytes);
node->runtime_data[0] = stats_sw_if_index;
}