ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

reassembly: get number of workers instead of threads (VPP-1435)

Browse Source 
Change-Id: If3abeab2b304e2df41139707a4c8d045fab6ef99
Signed-off-by: Juraj Sloboda <jsloboda@cisco.com>
This commit is contained in:
Juraj Sloboda
2018-10-10 10:15:54 +02:00
committed by Damjan Marion
parent 8b09953661
commit cd80692dfc
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/vnet/ip/ip4_reassembly.c
View File

@@ -1153,7 +1153,7 @@ ip4_reass_init_function (vlib_main_t * vm)
rm->vlib_main = vm;
rm->vnet_main = vnet_get_main ();
vec_validate (rm->per_thread_data, vlib_num_workers () + 1);
vec_validate (rm->per_thread_data, vlib_num_workers ());
ip4_reass_per_thread_t *rt;
vec_foreach (rt, rm->per_thread_data)
{
@@ -1214,7 +1214,7 @@ ip4_reass_walk_expired (vlib_main_t * vm,
uword thread_index = 0;
int index;
const uword nthreads = os_get_nthreads ();
const uword nthreads = vlib_num_workers () + 1;
for (thread_index = 0; thread_index < nthreads; ++thread_index)
{
ip4_reass_per_thread_t *rt = &rm->per_thread_data[thread_index];
@@ -1381,7 +1381,7 @@ show_ip4_reass (vlib_main_t * vm, unformat_input_t * input,
u64 sum_buffers_n = 0;
ip4_reass_t *reass;
uword thread_index;
const uword nthreads = os_get_nthreads ();
const uword nthreads = vlib_num_workers () + 1;
for (thread_index = 0; thread_index < nthreads; ++thread_index)
{
ip4_reass_per_thread_t *rt = &rm->per_thread_data[thread_index];

6
src/vnet/ip/ip6_reassembly.c
View File

@@ -1193,7 +1193,7 @@ ip6_reass_init_function (vlib_main_t * vm)
rm->vlib_main = vm;
rm->vnet_main = vnet_get_main ();
vec_validate (rm->per_thread_data, vlib_num_workers () + 1);
vec_validate (rm->per_thread_data, vlib_num_workers ());
ip6_reass_per_thread_t *rt;
vec_foreach (rt, rm->per_thread_data)
{
@@ -1262,7 +1262,7 @@ ip6_reass_walk_expired (vlib_main_t * vm,
uword thread_index = 0;
int index;
const uword nthreads = os_get_nthreads ();
const uword nthreads = vlib_num_workers () + 1;
u32 *vec_icmp_bi = NULL;
for (thread_index = 0; thread_index < nthreads; ++thread_index)
{
@@ -1472,7 +1472,7 @@ show_ip6_reass (vlib_main_t * vm, unformat_input_t * input,
u64 sum_buffers_n = 0;
ip6_reass_t *reass;
uword thread_index;
const uword nthreads = os_get_nthreads ();
const uword nthreads = vlib_num_workers () + 1;
for (thread_index = 0; thread_index < nthreads; ++thread_index)
{
ip6_reass_per_thread_t *rt = &rm->per_thread_data[thread_index];