Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
vppinfra: add tw_timer_2t_2w_512sl variant
[vpp.git]
/
src
/
vppinfra
/
CMakeLists.txt
diff --git
a/src/vppinfra/CMakeLists.txt
b/src/vppinfra/CMakeLists.txt
index
6c231bd
..
3128ad3
100644
(file)
--- a/
src/vppinfra/CMakeLists.txt
+++ b/
src/vppinfra/CMakeLists.txt
@@
-17,12
+17,13
@@
enable_language(ASM)
# Generate vppinfra/config.h
##############################################################################
set(LOG2_CACHE_LINE_BYTES ${VPP_LOG2_CACHE_LINE_SIZE})
# Generate vppinfra/config.h
##############################################################################
set(LOG2_CACHE_LINE_BYTES ${VPP_LOG2_CACHE_LINE_SIZE})
-option(VPP_USE_DLMALLOC "Use dlmalloc memory allocator." ON)
-if(VPP_USE_DLMALLOC)
- set(DLMALLOC 1)
-else(VPP_USE_DLMALLOC)
- set(DLMALLOC 0)
-endif(VPP_USE_DLMALLOC)
+
+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(
${CMAKE_SOURCE_DIR}/vppinfra/config.h.in
configure_file(
${CMAKE_SOURCE_DIR}/vppinfra/config.h.in
@@
-42,7
+43,7
@@
set(VPPINFRA_SRCS
backtrace.c
bihash_all_vector.c
cpu.c
backtrace.c
bihash_all_vector.c
cpu.c
-
cuckoo_template
.c
+
dlmalloc
.c
elf.c
elog.c
error.c
elf.c
elog.c
error.c
@@
-55,14
+56,15
@@
set(VPPINFRA_SRCS
longjmp.S
macros.c
maplog.c
longjmp.S
macros.c
maplog.c
+ mem_dlmalloc.c
mhash.c
mpcap.c
pcap.c
pmalloc.c
pool.c
ptclosure.c
mhash.c
mpcap.c
pcap.c
pmalloc.c
pool.c
ptclosure.c
- random.c
random_buffer.c
random_buffer.c
+ random.c
random_isaac.c
rbtree.c
serialize.c
random_isaac.c
rbtree.c
serialize.c
@@
-72,13
+74,12
@@
set(VPPINFRA_SRCS
string.c
time.c
time_range.c
string.c
time.c
time_range.c
- timer.c
timing_wheel.c
timing_wheel.c
- tw_timer_2t_1w_2048sl.c
- tw_timer_16t_2w_512sl.c
tw_timer_16t_1w_2048sl.c
tw_timer_16t_1w_2048sl.c
- tw_timer_
4t_3w_256
sl.c
+ tw_timer_
16t_2w_512
sl.c
tw_timer_1t_3w_1024sl_ov.c
tw_timer_1t_3w_1024sl_ov.c
+ tw_timer_2t_1w_2048sl.c
+ tw_timer_4t_3w_256sl.c
unformat.c
unix-formats.c
unix-misc.c
unformat.c
unix-formats.c
unix-misc.c
@@
-89,6
+90,7
@@
set(VPPINFRA_SRCS
)
set(VPPINFRA_HEADERS
)
set(VPPINFRA_HEADERS
+ sanitizer.h
bihash_16_8.h
bihash_24_8.h
bihash_40_8.h
bihash_16_8.h
bihash_24_8.h
bihash_40_8.h
@@
-106,6
+108,10
@@
set(VPPINFRA_HEADERS
clib.h
cpu.h
crc32.h
clib.h
cpu.h
crc32.h
+ cuckoo_8_8.h
+ cuckoo_16_8.h
+ cuckoo_template.h
+ cuckoo_template.c
dlist.h
dlmalloc.h
elf_clib.h
dlist.h
dlmalloc.h
elf_clib.h
@@
-135,7
+141,6
@@
set(VPPINFRA_HEADERS
memcpy_sse3.h
mem.h
mhash.h
memcpy_sse3.h
mem.h
mhash.h
- mheap_bootstrap.h
mheap.h
mpcap.h
os.h
mheap.h
mpcap.h
os.h
@@
-159,8
+164,8
@@
set(VPPINFRA_HEADERS
string.h
time.h
time_range.h
string.h
time.h
time_range.h
- timer.h
timing_wheel.h
timing_wheel.h
+ tw_timer_2t_2w_512sl.c
tw_timer_16t_1w_2048sl.h
tw_timer_16t_2w_512sl.h
tw_timer_1t_3w_1024sl_ov.h
tw_timer_16t_1w_2048sl.h
tw_timer_16t_2w_512sl.h
tw_timer_1t_3w_1024sl_ov.h
@@
-171,7
+176,6
@@
set(VPPINFRA_HEADERS
types.h
atomics.h
unix.h
types.h
atomics.h
unix.h
- valgrind.h
valloc.h
vec_bootstrap.h
vec.h
valloc.h
vec_bootstrap.h
vec.h
@@
-197,19
+201,6
@@
if("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
)
endif()
)
endif()
-
-if(VPP_USE_DLMALLOC)
- list(APPEND VPPINFRA_SRCS
- dlmalloc.c
- mem_dlmalloc.c
- )
-else(VPP_USE_DLMALLOC)
- list(APPEND VPPINFRA_SRCS
- mheap.c
- mem_mheap.c
- )
-endif(VPP_USE_DLMALLOC)
-
add_vpp_library(vppinfra
SOURCES ${VPPINFRA_SRCS}
LINK_LIBRARIES m
add_vpp_library(vppinfra
SOURCES ${VPPINFRA_SRCS}
LINK_LIBRARIES m
@@
-257,7
+248,7
@@
if(VPP_BUILD_VPPINFRA_TESTS)
)
add_vpp_executable(test_${test}
SOURCES test_${test}.c
)
add_vpp_executable(test_${test}
SOURCES test_${test}.c
- LINK_LIBRARIES vppinfra
+ LINK_LIBRARIES vppinfra
pthread
)
endforeach()
)
endforeach()