mirror of
https://github.com/ZLMediaKit/ZLMediaKit.git
synced 2026-06-12 19:24:22 +08:00
升级jemalloc到5.3版本 (#2884)
升级jemalloc到5.3版本,相比5.2.1内存稳定许多,去除--without-export编译参数, 解决类似glibc中分配内存却在jemalloc中释放导致崩溃问题. 比如: toolkit::LoggerWrapper::printLogV中使用的vasprintf
This commit is contained in:
@@ -39,6 +39,7 @@ option(ENABLE_FAAC "Enable FAAC" OFF)
|
||||
option(ENABLE_FFMPEG "Enable FFmpeg" OFF)
|
||||
option(ENABLE_HLS "Enable HLS" ON)
|
||||
option(ENABLE_JEMALLOC_STATIC "Enable static linking to the jemalloc library" OFF)
|
||||
option(ENABLE_JEMALLOC_DUMP "Enable jemalloc to dump malloc statistics" OFF)
|
||||
option(ENABLE_MEM_DEBUG "Enable Memory Debug" OFF)
|
||||
option(ENABLE_MP4 "Enable MP4" ON)
|
||||
option(ENABLE_HLS_FMP4 "Enable HLS-FMP4" ON)
|
||||
@@ -335,7 +336,11 @@ if(ENABLE_JEMALLOC_STATIC)
|
||||
if(NOT EXISTS ${DEP_ROOT_DIR})
|
||||
file(MAKE_DIRECTORY ${DEP_ROOT_DIR})
|
||||
endif()
|
||||
|
||||
if (ENABLE_JEMALLOC_DUMP)
|
||||
set(ENABLE_JEMALLOC_STAT ON)
|
||||
else ()
|
||||
set(ENABLE_JEMALLOC_STAT OFF)
|
||||
endif ()
|
||||
include(Jemalloc)
|
||||
include_directories(SYSTEM ${DEP_ROOT_DIR}/${JEMALLOC_NAME}/include/jemalloc)
|
||||
link_directories(${DEP_ROOT_DIR}/${JEMALLOC_NAME}/lib)
|
||||
@@ -349,6 +354,12 @@ if(JEMALLOC_FOUND)
|
||||
message(STATUS "found library: ${JEMALLOC_LIBRARIES}")
|
||||
include_directories(${JEMALLOC_INCLUDE_DIR})
|
||||
update_cached_list(MK_LINK_LIBRARIES ${JEMALLOC_LIBRARIES})
|
||||
add_definitions(-DUSE_JEMALLOC)
|
||||
message(STATUS "jemalloc will be used to avoid memory fragmentation")
|
||||
if (ENABLE_JEMALLOC_DUMP)
|
||||
add_definitions(-DENABLE_JEMALLOC_DUMP)
|
||||
message(STATUS "jemalloc will save memory usage statistics when the program exits")
|
||||
endif ()
|
||||
endif()
|
||||
|
||||
# 查找 openssl 是否安装
|
||||
|
||||
Reference in New Issue
Block a user