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
9c58046
..
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
@@
-56,6
+63,7
@@
set(VPPINFRA_SRCS
macros.c
maplog.c
mhash.c
macros.c
maplog.c
mhash.c
+ mpcap.c
pcap.c
pmalloc.c
pool.c
pcap.c
pmalloc.c
pool.c
@@
-71,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
@@
-88,6
+95,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
@@
-136,6
+144,7
@@
set(VPPINFRA_HEADERS
mhash.h
mheap_bootstrap.h
mheap.h
mhash.h
mheap_bootstrap.h
mheap.h
+ mpcap.h
os.h
pcap.h
pcap_funcs.h
os.h
pcap.h
pcap_funcs.h
@@
-157,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
@@
-169,7
+177,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
@@
-210,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
)
@@
-240,9
+247,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
@@
-253,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()