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
/
plugins
/
ioam
/
ip6
/
ioam_cache_tunnel_select_node.c
diff --git
a/src/plugins/ioam/ip6/ioam_cache_tunnel_select_node.c
b/src/plugins/ioam/ip6/ioam_cache_tunnel_select_node.c
index
a56dc04
..
0cf742c
100644
(file)
--- a/
src/plugins/ioam/ip6/ioam_cache_tunnel_select_node.c
+++ b/
src/plugins/ioam/ip6/ioam_cache_tunnel_select_node.c
@@
-396,7
+396,7
@@
ip6_reset_ts_hbh_node_fn (vlib_main_t * vm,
clib_net_to_host_u32
(tcp0->seq_number) + 1,
no_of_responses, now,
clib_net_to_host_u32
(tcp0->seq_number) + 1,
no_of_responses, now,
- vm->
cpu
_index, &pool_index0))
+ vm->
thread
_index, &pool_index0))
{
cache_ts_added++;
}
{
cache_ts_added++;
}
@@
-419,7
+419,7
@@
ip6_reset_ts_hbh_node_fn (vlib_main_t * vm,
e2e =
(ioam_e2e_cache_option_t *) ((u8 *) hbh0 +
cm->rewrite_pool_index_offset);
e2e =
(ioam_e2e_cache_option_t *) ((u8 *) hbh0 +
cm->rewrite_pool_index_offset);
- e2e->pool_id = (u8) vm->
cpu
_index;
+ e2e->pool_id = (u8) vm->
thread
_index;
e2e->pool_index = pool_index0;
ioam_e2e_id_rewrite_handler ((ioam_e2e_id_option_t *)
((u8 *) e2e +
e2e->pool_index = pool_index0;
ioam_e2e_id_rewrite_handler ((ioam_e2e_id_option_t *)
((u8 *) e2e +
@@
-455,7
+455,7
@@
ip6_reset_ts_hbh_node_fn (vlib_main_t * vm,
clib_net_to_host_u32
(tcp1->seq_number) + 1,
no_of_responses, now,
clib_net_to_host_u32
(tcp1->seq_number) + 1,
no_of_responses, now,
- vm->
cpu
_index, &pool_index1))
+ vm->
thread
_index, &pool_index1))
{
cache_ts_added++;
}
{
cache_ts_added++;
}
@@
-479,7
+479,7
@@
ip6_reset_ts_hbh_node_fn (vlib_main_t * vm,
e2e =
(ioam_e2e_cache_option_t *) ((u8 *) hbh1 +
cm->rewrite_pool_index_offset);
e2e =
(ioam_e2e_cache_option_t *) ((u8 *) hbh1 +
cm->rewrite_pool_index_offset);
- e2e->pool_id = (u8) vm->
cpu
_index;
+ e2e->pool_id = (u8) vm->
thread
_index;
e2e->pool_index = pool_index1;
ioam_e2e_id_rewrite_handler ((ioam_e2e_id_option_t *)
((u8 *) e2e +
e2e->pool_index = pool_index1;
ioam_e2e_id_rewrite_handler ((ioam_e2e_id_option_t *)
((u8 *) e2e +
@@
-562,7
+562,7
@@
ip6_reset_ts_hbh_node_fn (vlib_main_t * vm,
clib_net_to_host_u32
(tcp0->seq_number) + 1,
no_of_responses, now,
clib_net_to_host_u32
(tcp0->seq_number) + 1,
no_of_responses, now,
- vm->
cpu
_index, &pool_index0))
+ vm->
thread
_index, &pool_index0))
{
cache_ts_added++;
}
{
cache_ts_added++;
}
@@
-585,7
+585,7
@@
ip6_reset_ts_hbh_node_fn (vlib_main_t * vm,
e2e =
(ioam_e2e_cache_option_t *) ((u8 *) hbh0 +
cm->rewrite_pool_index_offset);
e2e =
(ioam_e2e_cache_option_t *) ((u8 *) hbh0 +
cm->rewrite_pool_index_offset);
- e2e->pool_id = (u8) vm->
cpu
_index;
+ e2e->pool_id = (u8) vm->
thread
_index;
e2e->pool_index = pool_index0;
ioam_e2e_id_rewrite_handler ((ioam_e2e_id_option_t *)
((u8 *) e2e +
e2e->pool_index = pool_index0;
ioam_e2e_id_rewrite_handler ((ioam_e2e_id_option_t *)
((u8 *) e2e +
@@
-701,7
+701,7
@@
expired_cache_ts_timer_callback (u32 * expired_timers)
ioam_cache_main_t *cm = &ioam_cache_main;
int i;
u32 pool_index;
ioam_cache_main_t *cm = &ioam_cache_main;
int i;
u32 pool_index;
- u32 thread_index =
os_get_cpu_number
();
+ u32 thread_index =
vlib_get_thread_index
();
u32 count = 0;
for (i = 0; i < vec_len (expired_timers); i++)
u32 count = 0;
for (i = 0; i < vec_len (expired_timers); i++)
@@
-724,7
+724,7
@@
ioam_cache_ts_timer_tick_node_fn (vlib_main_t * vm,
vlib_frame_t * f)
{
ioam_cache_main_t *cm = &ioam_cache_main;
vlib_frame_t * f)
{
ioam_cache_main_t *cm = &ioam_cache_main;
- u32 my_thread_index =
os_get_cpu_number
();
+ u32 my_thread_index =
vlib_get_thread_index
();
struct timespec ts, tsrem;
tw_timer_expire_timers_16t_2w_512sl (&cm->timer_wheels[my_thread_index],
struct timespec ts, tsrem;
tw_timer_expire_timers_16t_2w_512sl (&cm->timer_wheels[my_thread_index],