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: numa vector placement support
[vpp.git]
/
src
/
vppinfra
/
CMakeLists.txt
diff --git
a/src/vppinfra/CMakeLists.txt
b/src/vppinfra/CMakeLists.txt
index
d5242e8
..
60e6eef
100644
(file)
--- a/
src/vppinfra/CMakeLists.txt
+++ b/
src/vppinfra/CMakeLists.txt
@@
-24,6
+24,13
@@
else(VPP_USE_DLMALLOC)
set(DLMALLOC 0)
endif(VPP_USE_DLMALLOC)
set(DLMALLOC 0)
endif(VPP_USE_DLMALLOC)
+find_library(NUMA numa)
+if (NUMA)
+ set(NUMA_LIBRARY_FOUND 1)
+else(NUMA)
+ set(NUMA_LIBRARY_FOUND 0)
+endif()
+
configure_file(
${CMAKE_SOURCE_DIR}/vppinfra/config.h.in
${CMAKE_BINARY_DIR}/vppinfra/config.h
configure_file(
${CMAKE_SOURCE_DIR}/vppinfra/config.h.in
${CMAKE_BINARY_DIR}/vppinfra/config.h
@@
-39,12
+46,11
@@
install(
# vppinfra sources
##############################################################################
set(VPPINFRA_SRCS
# vppinfra sources
##############################################################################
set(VPPINFRA_SRCS
- asm_x86.c
backtrace.c
backtrace.c
+ bihash_all_vector.c
cpu.c
cuckoo_template.c
elf.c
cpu.c
cuckoo_template.c
elf.c
- elf_clib.c
elog.c
error.c
fheap.c
elog.c
error.c
fheap.c
@@
-57,12
+63,15
@@
set(VPPINFRA_SRCS
macros.c
maplog.c
mhash.c
macros.c
maplog.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_isaac.c
random.c
random_buffer.c
random_isaac.c
+ rbtree.c
serialize.c
slist.c
socket.c
serialize.c
slist.c
socket.c
@@
-70,7
+79,6
@@
set(VPPINFRA_SRCS
string.c
time.c
time_range.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
timing_wheel.c
tw_timer_2t_1w_2048sl.c
tw_timer_16t_2w_512sl.c
@@
-84,13
+92,10
@@
set(VPPINFRA_SRCS
vec.c
vector.c
zvec.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
+108,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
@@
-125,6
+131,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
@@
-137,14
+144,21
@@
set(VPPINFRA_HEADERS
mhash.h
mheap_bootstrap.h
mheap.h
mhash.h
mheap_bootstrap.h
mheap.h
+ mpcap.h
os.h
os.h
+ pcap.h
+ pcap_funcs.h
pipeline.h
pipeline.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
+ sha2.h
slist.h
smp.h
socket.h
slist.h
smp.h
socket.h
@@
-152,7
+166,6
@@
set(VPPINFRA_HEADERS
string.h
time.h
time_range.h
string.h
time.h
time_range.h
- timer.h
timing_wheel.h
tw_timer_16t_1w_2048sl.h
tw_timer_16t_2w_512sl.h
timing_wheel.h
tw_timer_16t_1w_2048sl.h
tw_timer_16t_2w_512sl.h
@@
-162,8
+175,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
@@
-181,6
+194,14
@@
set(VPPINFRA_HEADERS
linux/sysfs.h
)
linux/sysfs.h
)
+if("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
+ list(APPEND VPPINFRA_SRCS
+ elf_clib.c
+ linux/mem.c
+ linux/sysfs.c
+ )
+endif()
+
if(VPP_USE_DLMALLOC)
list(APPEND VPPINFRA_SRCS
if(VPP_USE_DLMALLOC)
list(APPEND VPPINFRA_SRCS
@@
-196,7
+217,7
@@
endif(VPP_USE_DLMALLOC)
add_vpp_library(vppinfra
SOURCES ${VPPINFRA_SRCS}
add_vpp_library(vppinfra
SOURCES ${VPPINFRA_SRCS}
- LINK_LIBRARIES m
+ LINK_LIBRARIES m
${NUMA}
INSTALL_HEADERS ${VPPINFRA_HEADERS}
COMPONENT libvppinfra
)
INSTALL_HEADERS ${VPPINFRA_HEADERS}
COMPONENT libvppinfra
)
@@
-221,13
+242,16
@@
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
slist
socket
serialize
slist
socket
+ spinlock
time
time_range
timing_wheel
time
time_range
timing_wheel
@@
-238,7
+262,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()