diff options
Diffstat (limited to 'src/vpp')
-rw-r--r-- | src/vpp/CMakeLists.txt | 20 | ||||
-rw-r--r-- | src/vpp/conf/startup.conf.in | 47 |
2 files changed, 62 insertions, 5 deletions
diff --git a/src/vpp/CMakeLists.txt b/src/vpp/CMakeLists.txt index df8383709b8..07983502096 100644 --- a/src/vpp/CMakeLists.txt +++ b/src/vpp/CMakeLists.txt @@ -15,17 +15,17 @@ # Generate vpp/app/version.h ############################################################################## add_custom_command( - OUTPUT ${CMAKE_BINARY_DIR}/include/vpp/app/version.h + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/app/version.h WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} COMMAND mkdir - ARGS -p ${CMAKE_BINARY_DIR}/include/vpp/app + ARGS -p ${CMAKE_CURRENT_BINARY_DIR}/app COMMAND scripts/generate_version_h - ARGS ${CMAKE_BINARY_DIR}/include/vpp/app/version.h + ARGS ${CMAKE_CURRENT_BINARY_DIR}/app/version.h COMMENT "Generating VPP version.h" ) add_custom_target(vpp_version_h - DEPENDS ${CMAKE_BINARY_DIR}/include/vpp/app/version.h + DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/app/version.h ) ############################################################################## @@ -35,7 +35,7 @@ option(VPP_API_TEST_BUILTIN "Use builtin VPP API test." ON) configure_file( ${CMAKE_SOURCE_DIR}/vpp/vnet/config.h.in - ${CMAKE_BINARY_DIR}/vpp/vnet/config.h + ${CMAKE_CURRENT_BINARY_DIR}/vnet/config.h ) set(VPP_API_FILES @@ -141,3 +141,13 @@ install(FILES conf/80-vpp.conf DESTINATION etc/sysctl.d COMPONENT vpp) add_vpp_test_library(vpp ${VPP_API_FILES} ) + +############################################################################## +# minimal interactive startup.conf - only if not present +############################################################################## +if(NOT EXISTS ${CMAKE_BINARY_DIR}/startup.conf) + configure_file( + ${CMAKE_CURRENT_SOURCE_DIR}/conf/startup.conf.in + ${CMAKE_BINARY_DIR}/startup.conf + ) +endif() diff --git a/src/vpp/conf/startup.conf.in b/src/vpp/conf/startup.conf.in new file mode 100644 index 00000000000..dd3c37120e2 --- /dev/null +++ b/src/vpp/conf/startup.conf.in @@ -0,0 +1,47 @@ + +unix { + interactive + # log @CMAKE_BINARY_DIR@/vpp.log + # full-coredump + # cli-listen @CMAKE_BINARY_DIR@/cli.sock + # exec @CMAKE_BINARY_DIR@/startup.vpp +} + +api-trace { + on +} + +memory { + main-heap-size 1G + # main-heap-page-size 1G +} + +cpu { + # main-core 1 + # corelist-workers 2-3,18-19 +} + +# buffers { + # buffers-per-numa 128000 + # page-size default-hugepage +# } + +plugins { + plugin dpdk_plugin.so { disable } + plugin unittest_plugin.so { enable } +} + +# dpdk { +# no-pci +#} + +statseg { + size 32m + # page-size 4k + # socket-name @CMAKE_BINARY_DIR@/stats.sock +} + +#logging { + # default-syslog-log-level debug + # class dpdk/cryptodev { rate-limit 100 level debug syslog-level error } +#} |