Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
avoid using thread local storage for thread index
[vpp.git]
/
src
/
vnet
/
bonding
/
node.c
diff --git
a/src/vnet/bonding/node.c
b/src/vnet/bonding/node.c
index
7d2acf7
..
7abd7b0
100644
(file)
--- a/
src/vnet/bonding/node.c
+++ b/
src/vnet/bonding/node.c
@@
-67,7
+67,7
@@
typedef enum
{
BOND_INPUT_NEXT_DROP,
BOND_INPUT_N_NEXT,
{
BOND_INPUT_NEXT_DROP,
BOND_INPUT_N_NEXT,
-}
l2
output_next_t;
+}
bond_
output_next_t;
static_always_inline u8
packet_is_cdp (ethernet_header_t * eth)
static_always_inline u8
packet_is_cdp (ethernet_header_t * eth)
@@
-138,7
+138,7
@@
bond_update_next (vlib_main_t * vm, vlib_node_runtime_t * node,
u32 * bond_sw_if_index, vlib_buffer_t * b,
u32 * next_index, vlib_error_t * error)
{
u32 * bond_sw_if_index, vlib_buffer_t * b,
u32 * next_index, vlib_error_t * error)
{
- u16 thread_index = v
lib_get_thread_index ()
;
+ u16 thread_index = v
m->thread_index
;
slave_if_t *sif;
bond_if_t *bif;
slave_if_t *sif;
bond_if_t *bif;
@@
-176,7
+176,7
@@
VLIB_NODE_FN (bond_input_node) (vlib_main_t * vm,
vlib_node_runtime_t * node,
vlib_frame_t * frame)
{
vlib_node_runtime_t * node,
vlib_frame_t * frame)
{
- u16 thread_index = v
lib_get_thread_index ()
;
+ u16 thread_index = v
m->thread_index
;
u32 *from, n_left;
vlib_buffer_t *bufs[VLIB_FRAME_SIZE], **b;
u32 sw_if_indices[VLIB_FRAME_SIZE], *sw_if_index;
u32 *from, n_left;
vlib_buffer_t *bufs[VLIB_FRAME_SIZE], **b;
u32 sw_if_indices[VLIB_FRAME_SIZE], *sw_if_index;
@@
-329,17
+329,12
@@
VLIB_NODE_FN (bond_input_node) (vlib_main_t * vm,
n_left = frame->n_vectors; /* number of packets to process */
b = bufs;
sw_if_index = sw_if_indices;
n_left = frame->n_vectors; /* number of packets to process */
b = bufs;
sw_if_index = sw_if_indices;
- next = nexts;
bond_packet_trace_t *t0;
bond_packet_trace_t *t0;
- uword n_trace = vlib_get_trace_count (vm, node);
- while (n_left
&& n_trace
)
+ while (n_left)
{
if (PREDICT_FALSE (b[0]->flags & VLIB_BUFFER_IS_TRACED))
{
{
if (PREDICT_FALSE (b[0]->flags & VLIB_BUFFER_IS_TRACED))
{
- vlib_trace_buffer (vm, node, next[0], b[0],
- 0 /* follow_chain */ );
- vlib_set_trace_count (vm, node, --n_trace);
t0 = vlib_add_trace (vm, node, b[0], sizeof (*t0));
t0->sw_if_index = sw_if_index[0];
clib_memcpy (&t0->ethernet, vlib_buffer_get_current (b[0]),
t0 = vlib_add_trace (vm, node, b[0], sizeof (*t0));
t0->sw_if_index = sw_if_index[0];
clib_memcpy (&t0->ethernet, vlib_buffer_get_current (b[0]),
@@
-350,7
+345,6
@@
VLIB_NODE_FN (bond_input_node) (vlib_main_t * vm,
n_left--;
b++;
sw_if_index++;
n_left--;
b++;
sw_if_index++;
- next++;
}
}
}
}