From 5684a0e3079e1c1221bff3208f313559e33b00c9 Mon Sep 17 00:00:00 2001 From: Josiah VanderZee Date: Thu, 15 Jun 2023 08:11:11 -0500 Subject: [PATCH 1/3] Add option to enable fast SDK in CMake build This adds a new option that defaults to OFF: ENABLE_FAST_SDK. --- CMakeLists.txt | 8 ++++++-- include/tscore/ink_config.h.cmake.in | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6706513b85f..971a1f5004f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -38,12 +38,13 @@ execute_process(COMMAND uname -n OUTPUT_VARIABLE BUILD_MACHINE OUTPUT_STRIP_TRAI # Options set(DEFAULT_STACK_SIZE 1048576 CACHE STRING "Default stack size (default 1048576)") +option(ENABlE_FAST_SDK "Use fast SDK APIs (default OFF)") +option(ENABLE_JEMALLOC "Use jemalloc (default OFF)") +option(ENABLE_MIMALLOC "Use mimalloc (default OFF)") option(ENABLE_POSIX_CAP "Use POSIX capabilities, turn OFF to use id switching. (default ON)" ON ) -option(ENABLE_JEMALLOC "Use jemalloc (default OFF)") -option(ENABLE_MIMALLOC "Use mimalloc (default OFF)") option(ENABLE_PROFILER "Use gperftools profiler (default OFF)") option(ENABLE_TCMALLOC "Use TCMalloc (default OFF)") set(TS_MAX_HOST_NAME_LEN 256 CACHE STRING "Max host name length (default 256)") @@ -51,6 +52,8 @@ set(TS_USE_SET_RBIO 1 CACHE STRING "Use openssl set_rbio (default 1)") set(TS_USE_DIAGS 1 CACHE STRING "Use diags (default 1)") option(TS_USE_HWLOC "Use hwloc (default OFF)") +set(TS_USE_FAST_SDK ${ENABLE_FAST_SDK}) + set(TS_VERSION_MAJOR 10) set(TS_VERSION_MINOR 0) set(TS_VERSION_MICRO 0) @@ -59,6 +62,7 @@ set(TS_LIBTOOL_VERSION ${TS_LIBTOOL_MAJOR}:${TS_VERSION_MICRO}:${TS_VERSION_MINO set(TS_VERSION_STRING TS_VERSION_S) set(TS_VERSION_NUMBER TS_VERSION_N) + # Check include files include(CheckIncludeFile) include(CheckIncludeFiles) diff --git a/include/tscore/ink_config.h.cmake.in b/include/tscore/ink_config.h.cmake.in index 1c5dadfa60f..4a3e7b1770a 100644 --- a/include/tscore/ink_config.h.cmake.in +++ b/include/tscore/ink_config.h.cmake.in @@ -118,7 +118,7 @@ const int DEFAULT_STACKSIZE = @DEFAULT_STACK_SIZE@; #cmakedefine01 TS_HAS_PROFILER #cmakedefine01 TS_USE_DIAGS #cmakedefine01 TS_USE_EPOLL -#cmakedefine01 TS_USE_GET_DH_2048_256 +#cmakedefine01 TS_USE_FAST_SDK #cmakedefine01 TS_USE_HWLOC #cmakedefine01 TS_USE_KQUEUE #cmakedefine01 TS_USE_LINUX_IO_URING From 1b09ff755b4399b09d3d24a6803dd6581258d717 Mon Sep 17 00:00:00 2001 From: Josiah VanderZee Date: Thu, 15 Jun 2023 14:35:36 -0500 Subject: [PATCH 2/3] Fix typo in option name --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 971a1f5004f..1dafffdbe15 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -38,7 +38,7 @@ execute_process(COMMAND uname -n OUTPUT_VARIABLE BUILD_MACHINE OUTPUT_STRIP_TRAI # Options set(DEFAULT_STACK_SIZE 1048576 CACHE STRING "Default stack size (default 1048576)") -option(ENABlE_FAST_SDK "Use fast SDK APIs (default OFF)") +option(ENABLE_FAST_SDK "Use fast SDK APIs (default OFF)") option(ENABLE_JEMALLOC "Use jemalloc (default OFF)") option(ENABLE_MIMALLOC "Use mimalloc (default OFF)") option(ENABLE_POSIX_CAP From 3e9b8abaad2165af3f7f1b809fb2064140a43006 Mon Sep 17 00:00:00 2001 From: Josiah VanderZee Date: Thu, 15 Jun 2023 16:48:30 -0500 Subject: [PATCH 3/3] Put accidentally deleted #cmakedefine01 back in --- include/tscore/ink_config.h.cmake.in | 1 + 1 file changed, 1 insertion(+) diff --git a/include/tscore/ink_config.h.cmake.in b/include/tscore/ink_config.h.cmake.in index 4a3e7b1770a..cc0446822d1 100644 --- a/include/tscore/ink_config.h.cmake.in +++ b/include/tscore/ink_config.h.cmake.in @@ -119,6 +119,7 @@ const int DEFAULT_STACKSIZE = @DEFAULT_STACK_SIZE@; #cmakedefine01 TS_USE_DIAGS #cmakedefine01 TS_USE_EPOLL #cmakedefine01 TS_USE_FAST_SDK +#cmakedefine01 TS_USE_GET_DH_2048_256 #cmakedefine01 TS_USE_HWLOC #cmakedefine01 TS_USE_KQUEUE #cmakedefine01 TS_USE_LINUX_IO_URING