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: move unused code to extras/deprecated/vppinfra
[vpp.git]
/
src
/
vppinfra
/
CMakeLists.txt
diff --git
a/src/vppinfra/CMakeLists.txt
b/src/vppinfra/CMakeLists.txt
index
d5242e8
..
e667eb0
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,15
+40,13
@@
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
elf.c
- elf_clib.c
elog.c
error.c
elog.c
error.c
- fheap.c
fifo.c
format.c
graph.c
fifo.c
format.c
graph.c
@@
-56,41
+55,40
@@
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
pool.c
ptclosure.c
- qsort.c
- random.c
random_buffer.c
random_buffer.c
+ random.c
random_isaac.c
random_isaac.c
+ rbtree.c
serialize.c
serialize.c
- slist.c
socket.c
std-formats.c
string.c
time.c
time_range.c
socket.c
std-formats.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
valloc.c
vec.c
vector.c
unformat.c
unix-formats.c
unix-misc.c
valloc.c
vec.c
vector.c
- zvec.c
- linux/mem.c
- linux/sysfs.c
)
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
@@
-103,6
+101,7
@@
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
clib_error.h
clib.h
cpu.h
@@
-114,17
+113,14
@@
set(VPPINFRA_HEADERS
elog.h
error_bootstrap.h
error.h
elog.h
error_bootstrap.h
error.h
- fheap.h
fifo.h
file.h
fifo.h
file.h
- flowhash_24_16.h
- flowhash_8_8.h
- flowhash_template.h
format.h
graph.h
hash.h
heap.h
lb_hash_hash.h
format.h
graph.h
hash.h
heap.h
lb_hash_hash.h
+ llist.h
lock.h
longjmp.h
macros.h
lock.h
longjmp.h
macros.h
@@
-135,25
+131,29
@@
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
os.h
- pipeline.h
+ pcap.h
+ pcap_funcs.h
+ pmalloc.h
pool.h
pool.h
+ pmc.h
ptclosure.h
random_buffer.h
random.h
random_isaac.h
ptclosure.h
random_buffer.h
random.h
random_isaac.h
+ rbtree.h
serialize.h
serialize.h
- s
list
.h
+ s
ha2
.h
smp.h
socket.h
sparse_vec.h
string.h
time.h
time_range.h
smp.h
socket.h
sparse_vec.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
@@
-162,8
+162,8
@@
set(VPPINFRA_HEADERS
tw_timer_template.c
tw_timer_template.h
types.h
tw_timer_template.c
tw_timer_template.h
types.h
+ atomics.h
unix.h
unix.h
- valgrind.h
valloc.h
vec_bootstrap.h
vec.h
valloc.h
vec_bootstrap.h
vec.h
@@
-175,24
+175,17
@@
set(VPPINFRA_HEADERS
vector_neon.h
vector_sse42.h
xxhash.h
vector_neon.h
vector_sse42.h
xxhash.h
- xy.h
- zvec.h
linux/syscall.h
linux/sysfs.h
)
linux/syscall.h
linux/sysfs.h
)
-
-if(VPP_USE_DLMALLOC)
+if("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
list(APPEND VPPINFRA_SRCS
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)
+ elf_clib.c
+ linux/mem.c
+ linux/sysfs.c
+ )
+endif()
add_vpp_library(vppinfra
SOURCES ${VPPINFRA_SRCS}
add_vpp_library(vppinfra
SOURCES ${VPPINFRA_SRCS}
@@
-208,12
+201,10
@@
option(VPP_BUILD_VPPINFRA_TESTS "Build vppinfra tests." OFF)
if(VPP_BUILD_VPPINFRA_TESTS)
foreach(test
bihash_vec88
if(VPP_BUILD_VPPINFRA_TESTS)
foreach(test
bihash_vec88
- cuckoo_template
dlist
elf
elog
fifo
dlist
elf
elog
fifo
- flowhash_template
format
fpool
hash
format
fpool
hash
@@
-221,28
+212,28
@@
if(VPP_BUILD_VPPINFRA_TESTS)
longjmp
macros
maplog
longjmp
macros
maplog
+ pmalloc
pool_iterate
ptclosure
random
random_isaac
pool_iterate
ptclosure
random
random_isaac
+ rwlock
serialize
serialize
- slist
socket
socket
+ spinlock
time
time_range
time
time_range
- timing_wheel
tw_timer
valloc
vec
tw_timer
valloc
vec
- zvec
)
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()
- foreach(test bihash_template
cuckoo_bihash
)
+ foreach(test bihash_template)
add_vpp_executable(test_${test}
SOURCES test_${test}.c
LINK_LIBRARIES vppinfra Threads::Threads
add_vpp_executable(test_${test}
SOURCES test_${test}.c
LINK_LIBRARIES vppinfra Threads::Threads