# 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
COMPONENT vpp-dev
)
+add_definitions(-fvisibility=hidden)
+
+# Ensure symbols from cJSON are exported
+set_source_files_properties( cJSON.c PROPERTIES
+ COMPILE_DEFINITIONS " CJSON_API_VISIBILITY " )
+
+
##############################################################################
# vppinfra sources
##############################################################################
set(VPPINFRA_SRCS
- asm_x86.c
backtrace.c
+ bihash_all_vector.c
cpu.c
- cuckoo_template.c
+ dlmalloc.c
elf.c
elog.c
error.c
- fheap.c
fifo.c
format.c
graph.c
longjmp.S
macros.c
maplog.c
+ mem.c
+ mem_dlmalloc.c
mhash.c
+ mpcap.c
+ pcap.c
+ pmalloc.c
pool.c
ptclosure.c
- random.c
random_buffer.c
+ random.c
random_isaac.c
+ rbtree.c
serialize.c
- slist.c
socket.c
std-formats.c
string.c
time.c
time_range.c
- timer.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_4t_3w_256sl.c
+ tw_timer_16t_2w_512sl.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
- zvec.c
+ cJSON.c
)
set(VPPINFRA_HEADERS
- asm_mips.h
- asm_x86.h
+ sanitizer.h
bihash_16_8.h
bihash_24_8.h
bihash_40_8.h
bihash_48_8.h
bihash_8_8.h
+ bihash_8_16.h
+ bihash_24_16.h
bihash_template.c
bihash_template.h
bihash_vec8_8.h
bitops.h
byte_order.h
cache.h
+ callback.h
+ callback_data.h
+ cJSON.h
clib_error.h
clib.h
cpu.h
elog.h
error_bootstrap.h
error.h
- fheap.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
+ llist.h
lock.h
longjmp.h
macros.h
memcpy_sse3.h
mem.h
mhash.h
- mheap_bootstrap.h
- mheap.h
+ mpcap.h
os.h
- pipeline.h
+ pcap.h
+ pcap_funcs.h
+ pmalloc.h
pool.h
pmc.h
ptclosure.h
random_buffer.h
random.h
random_isaac.h
+ rbtree.h
serialize.h
- slist.h
+ sha2.h
smp.h
socket.h
sparse_vec.h
string.h
time.h
time_range.h
- timer.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
types.h
atomics.h
unix.h
- valgrind.h
valloc.h
vec_bootstrap.h
vec.h
vector.h
vector_neon.h
vector_sse42.h
+ warnings.h
xxhash.h
- xy.h
- zvec.h
linux/syscall.h
linux/sysfs.h
)
)
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
INSTALL_HEADERS ${VPPINFRA_HEADERS}
COMPONENT libvppinfra
+ LTO
)
##############################################################################
if(VPP_BUILD_VPPINFRA_TESTS)
foreach(test
bihash_vec88
- cuckoo_template
dlist
elf
elog
fifo
- flowhash_template
format
fpool
hash
longjmp
macros
maplog
+ pmalloc
pool_iterate
ptclosure
random
random_isaac
+ rwlock
serialize
- slist
socket
+ spinlock
time
time_range
- timing_wheel
tw_timer
valloc
vec
- zvec
)
add_vpp_executable(test_${test}
SOURCES test_${test}.c
- LINK_LIBRARIES vppinfra
+ LINK_LIBRARIES vppinfra pthread
)
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