Merge pull request #21 from kblaschke/allow-jemalloc-from-system

Support prefixed and non-prefixed JeMalloc functions
This commit is contained in:
Kae 2024-02-22 12:00:37 +11:00 committed by GitHub
commit 3b25df55b5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 41 additions and 1 deletions

View File

@ -37,8 +37,23 @@ find_package_handle_standard_args(JeMalloc DEFAULT_MSG
JEMALLOC_INCLUDE_DIR
)
# Check if the JeMalloc library was compiled with the "je_" prefix.
include(CheckSymbolExists)
set(CMAKE_REQUIRED_INCLUDES ${JEMALLOC_INCLUDE_DIR})
set(CMAKE_REQUIRED_LIBRARIES ${JEMALLOC_LIBRARY})
check_symbol_exists("je_malloc" "jemalloc/jemalloc.h" _jemalloc_is_prefixed)
unset(CMAKE_REQUIRED_INCLUDES)
unset(CMAKE_REQUIRED_LIBRARIES)
if(_jemalloc_is_prefixed)
set(JEMALLOC_IS_PREFIXED TRUE)
endif()
unset(_jemalloc_is_prefixed)
mark_as_advanced(
JEMALLOC_ROOT_DIR
JEMALLOC_LIBRARY
JEMALLOC_INCLUDE_DIR
JEMALLOC_IS_PREFIXED
)

View File

@ -214,4 +214,10 @@ ELSEIF (STAR_SYSTEM_FAMILY_WINDOWS)
ENDIF ()
ADD_LIBRARY (star_core OBJECT ${star_core_SOURCES} ${star_core_HEADERS})
TARGET_PRECOMPILE_HEADERS (star_core PUBLIC StarPch.hpp)
TARGET_PRECOMPILE_HEADERS (star_core PUBLIC StarPch.hpp)
IF(STAR_USE_JEMALLOC AND JEMALLOC_IS_PREFIXED)
SET_SOURCE_FILES_PROPERTIES(StarMemory.cpp PROPERTIES
COMPILE_DEFINITIONS STAR_JEMALLOC_IS_PREFIXED
)
ENDIF()

View File

@ -7,6 +7,7 @@
namespace Star {
#ifdef STAR_USE_JEMALLOC
#ifdef STAR_JEMALLOC_IS_PREFIXED
void* malloc(size_t size) {
return je_malloc(size);
}
@ -32,6 +33,24 @@ namespace Star {
return ::realloc(ptr, size);
}
void free(void* ptr) {
::free(ptr);
}
void free(void* ptr, size_t size) {
if (ptr)
::sdallocx(ptr, size, 0);
}
#endif
#else
void* malloc(size_t size) {
return ::malloc(size);
}
void* realloc(void* ptr, size_t size) {
return ::realloc(ptr, size);
}
void free(void* ptr) {
return ::free(ptr);
}