diff options
| author | liuxueli <[email protected]> | 2023-02-28 17:50:04 +0800 |
|---|---|---|
| committer | liuxueli <[email protected]> | 2023-02-28 17:50:04 +0800 |
| commit | 7448abe3cf05b3cf717639f28451345c719fe96f (patch) | |
| tree | 12a36dacae73b0cbe8cffe4cffbbaa0c3df53911 | |
| parent | 2426da38d0d4e53c78651330396e6121c5c39ee7 (diff) | |
TSG-12461: 使用静态链接jemalloc后加壳失败，调整为动态链接jemallocv4.2.95
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/entry/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | vendor/CMakeLists.txt | 34 |
3 files changed, 19 insertions, 19 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 975e6cb..63f3e93 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -141,7 +141,7 @@ elseif(MEM_POOL MATCHES "TCMALLOC_MINI") elseif(MEM_POOL MATCHES "TCMALLOC") set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -ltcmalloc -fno-builtin-malloc -fno-builtin-calloc -fno-builtin-realloc -fno-builtin-free") elseif(MEM_POOL MATCHES "JEMALLOC") - #set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -ljemalloc -fno-builtin-malloc -fno-builtin-calloc -fno-builtin-realloc -fno-builtin-free") + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -ljemalloc -fno-builtin-malloc -fno-builtin-calloc -fno-builtin-realloc -fno-builtin-free") endif() diff --git a/src/entry/CMakeLists.txt b/src/entry/CMakeLists.txt index e82691b..1eada31 100644 --- a/src/entry/CMakeLists.txt +++ b/src/entry/CMakeLists.txt @@ -25,7 +25,7 @@ target_link_libraries(sapp breakpad_mini) target_include_directories(sapp PRIVATE ${SYSTEMD_INCLUDE_DIRS}) -set(SAPP_MODULES timestamp_record md5 symbol_check MESA_sleep MESA_socket_wrap packet_io dealpkt project plugctrl common config timer tomlc99_wrap dpdk_ip_hash libevent-static gdev_assistant inner_plug libdabloom-static sapp_dev sapp_assistant cpu_limit timeout libjemalloc-static) +set(SAPP_MODULES timestamp_record md5 symbol_check MESA_sleep MESA_socket_wrap packet_io dealpkt project plugctrl common config timer tomlc99_wrap dpdk_ip_hash libevent-static gdev_assistant inner_plug libdabloom-static sapp_dev sapp_assistant cpu_limit timeout) if(MEM_POOL MATCHES "DICTATOR_DEBUG") set(SAPP_MODULES ${SAPP_MODULES} dictator2_debug) diff --git a/vendor/CMakeLists.txt b/vendor/CMakeLists.txt index c03aaf2..2dd93ae 100644 --- a/vendor/CMakeLists.txt +++ b/vendor/CMakeLists.txt @@ -48,20 +48,20 @@ add_dependencies(libdabloom-static libdabloom) set_property(TARGET libdabloom-static PROPERTY IMPORTED_LOCATION ${INSTALL_DIR}/lib/libdablooms.a) set_property(TARGET libdabloom-static PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${INSTALL_DIR}/include) -## jemalloc -ExternalProject_Add(libjemalloc PREFIX libjemalloc - URL ${CMAKE_CURRENT_SOURCE_DIR}/jemalloc-5.3.0.tar.gz - URL_MD5 594dd8e0a1e8c1ef8a1b210a1a5aff5b - CONFIGURE_COMMAND ./autogen.sh --prefix=<INSTALL_DIR> - BUILD_COMMAND make - BUILD_IN_SOURCE 1 - INSTALL_COMMAND make install prefix=<INSTALL_DIR>) - -ExternalProject_Get_Property(libjemalloc INSTALL_DIR) -file(MAKE_DIRECTORY ${INSTALL_DIR}/include) - -add_library(libjemalloc-static STATIC IMPORTED GLOBAL) -add_dependencies(libjemalloc-static libjemalloc) -set_property(TARGET libjemalloc-static PROPERTY IMPORTED_LOCATION ${INSTALL_DIR}/lib/libjemalloc.a) -set_property(TARGET libjemalloc-static PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${INSTALL_DIR}/include) - +### jemalloc +#ExternalProject_Add(libjemalloc PREFIX libjemalloc +# URL ${CMAKE_CURRENT_SOURCE_DIR}/jemalloc-5.3.0.tar.gz +# URL_MD5 594dd8e0a1e8c1ef8a1b210a1a5aff5b +# CONFIGURE_COMMAND ./autogen.sh --prefix=<INSTALL_DIR> +# BUILD_COMMAND make +# BUILD_IN_SOURCE 1 +# INSTALL_COMMAND make install prefix=<INSTALL_DIR>) +# +#ExternalProject_Get_Property(libjemalloc INSTALL_DIR) +#file(MAKE_DIRECTORY ${INSTALL_DIR}/include) +# +#add_library(libjemalloc-static STATIC IMPORTED GLOBAL) +#add_dependencies(libjemalloc-static libjemalloc) +#set_property(TARGET libjemalloc-static PROPERTY IMPORTED_LOCATION ${INSTALL_DIR}/lib/libjemalloc.a) +#set_property(TARGET libjemalloc-static PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${INSTALL_DIR}/include) +# |