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: install missing tw_timer_2t_2w_512sl header file
[vpp.git]
/
src
/
vppinfra
/
CMakeLists.txt
diff --git
a/src/vppinfra/CMakeLists.txt
b/src/vppinfra/CMakeLists.txt
index
4f0d16b
..
f2279d0
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
@@
-39,10
+40,10
@@
install(
# vppinfra sources
##############################################################################
set(VPPINFRA_SRCS
# vppinfra sources
##############################################################################
set(VPPINFRA_SRCS
- asm_x86.c
backtrace.c
backtrace.c
+ bihash_all_vector.c
cpu.c
cpu.c
-
cuckoo_template
.c
+
dlmalloc
.c
elf.c
elog.c
error.c
elf.c
elog.c
error.c
@@
-55,14
+56,17
@@
set(VPPINFRA_SRCS
longjmp.S
macros.c
maplog.c
longjmp.S
macros.c
maplog.c
+ mem_dlmalloc.c
mhash.c
mhash.c
+ mpcap.c
pcap.c
pmalloc.c
pool.c
ptclosure.c
pcap.c
pmalloc.c
pool.c
ptclosure.c
- random.c
random_buffer.c
random_buffer.c
+ random.c
random_isaac.c
random_isaac.c
+ rbtree.c
serialize.c
slist.c
socket.c
serialize.c
slist.c
socket.c
@@
-70,13
+74,13
@@
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_2t_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
@@
-87,8
+91,7
@@
set(VPPINFRA_SRCS
)
set(VPPINFRA_HEADERS
)
set(VPPINFRA_HEADERS
- asm_mips.h
- asm_x86.h
+ 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
@@
-101,10
+104,17
@@
set(VPPINFRA_HEADERS
bitops.h
byte_order.h
cache.h
bitops.h
byte_order.h
cache.h
+ callback.h
clib_error.h
clib.h
cpu.h
crc32.h
clib_error.h
clib.h
cpu.h
crc32.h
+ cuckoo_8_8.h
+ cuckoo_16_8.h
+ cuckoo_common.h
+ cuckoo_debug.h
+ cuckoo_template.h
+ cuckoo_template.c
dlist.h
dlmalloc.h
elf_clib.h
dlist.h
dlmalloc.h
elf_clib.h
@@
-123,6
+133,7
@@
set(VPPINFRA_HEADERS
hash.h
heap.h
lb_hash_hash.h
hash.h
heap.h
lb_hash_hash.h
+ llist.h
lock.h
longjmp.h
macros.h
lock.h
longjmp.h
macros.h
@@
-133,8
+144,8
@@
set(VPPINFRA_HEADERS
memcpy_sse3.h
mem.h
mhash.h
memcpy_sse3.h
mem.h
mhash.h
- mheap_bootstrap.h
mheap.h
mheap.h
+ mpcap.h
os.h
pcap.h
pcap_funcs.h
os.h
pcap.h
pcap_funcs.h
@@
-146,7
+157,9
@@
set(VPPINFRA_HEADERS
random_buffer.h
random.h
random_isaac.h
random_buffer.h
random.h
random_isaac.h
+ rbtree.h
serialize.h
serialize.h
+ sha2.h
slist.h
smp.h
socket.h
slist.h
smp.h
socket.h
@@
-154,8
+167,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.h
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
@@
-166,7
+179,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
@@
-192,19
+204,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
@@
-237,9
+236,11
@@
if(VPP_BUILD_VPPINFRA_TESTS)
ptclosure
random
random_isaac
ptclosure
random
random_isaac
+ rwlock
serialize
slist
socket
serialize
slist
socket
+ spinlock
time
time_range
timing_wheel
time
time_range
timing_wheel
@@
-250,7
+251,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()