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

vppinfra: add cmake option to grow vectors by 1

Browse Source 
For debugging. Do not set this option in production.

Type: feature

Signed-off-by: Dave Barach <dave@barachs.net>
Change-Id: I5e59671c4932e064bc087b85bf9c62c6f3bf48cf
This commit is contained in:
Dave Barach
2020-02-10 10:16:40 -05:00
committed by Neale Ranns
parent 104112f2d4
commit 98bd757787
3 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/vppinfra/CMakeLists.txt
View File

@ -18,6 +18,13 @@ enable_language(ASM)
############################################################################## ##############################################################################
set(LOG2_CACHE_LINE_BYTES ${VPP_LOG2_CACHE_LINE_SIZE}) set(LOG2_CACHE_LINE_BYTES ${VPP_LOG2_CACHE_LINE_SIZE})
option(VPP_VECTOR_GROW_BY_ONE "Vectors grow by one, instead of 3/2" OFF)
if(VPP_VECTOR_GROW_BY_ONE)
set(VECTOR_GROW_BY_ONE 1)
else(VPP_VECTOR_GROW_BY_ONE)
set(VECTOR_GROW_BY_ONE 0)
endif(VPP_VECTOR_GROW_BY_ONE)
configure_file( configure_file(
${CMAKE_SOURCE_DIR}/vppinfra/config.h.in ${CMAKE_SOURCE_DIR}/vppinfra/config.h.in
${CMAKE_BINARY_DIR}/vppinfra/config.h ${CMAKE_BINARY_DIR}/vppinfra/config.h

2
src/vppinfra/config.h.in
View File

@ -21,4 +21,6 @@
#endif #endif
#define CLIB_TARGET_TRIPLET "@CMAKE_C_COMPILER_TARGET@" #define CLIB_TARGET_TRIPLET "@CMAKE_C_COMPILER_TARGET@"
#define CLIB_VECTOR_GROW_BY_ONE @VECTOR_GROW_BY_ONE@
#endif #endif

4
src/vppinfra/vec.c
View File

@ -95,9 +95,13 @@ vec_resize_allocate_memory (void *v,
return v; return v;
} }
#if CLIB_VECTOR_GROW_BY_ONE > 0
new_alloc_bytes = data_bytes;
#else
new_alloc_bytes = (old_alloc_bytes * 3) / 2; new_alloc_bytes = (old_alloc_bytes * 3) / 2;
if (new_alloc_bytes < data_bytes) if (new_alloc_bytes < data_bytes)
new_alloc_bytes = data_bytes; new_alloc_bytes = data_bytes;
#endif
new = new =
clib_mem_alloc_aligned_at_offset (new_alloc_bytes, data_align, clib_mem_alloc_aligned_at_offset (new_alloc_bytes, data_align,