Cleanup jemalloc contrib

contrib/jemalloc-cmake/CMakeLists.txt

@@ -12,9 +12,6 @@ else ()
 endif ()
 
 if (NOT ENABLE_JEMALLOC)
-    add_library(jemalloc INTERFACE)
-    target_compile_definitions(jemalloc INTERFACE USE_JEMALLOC=0)
-
     message (STATUS "Not using jemalloc")
     return()
 endif ()
@@ -140,6 +137,4 @@ target_compile_options(jemalloc PRIVATE -Wno-redundant-decls)
 # for RTLD_NEXT
 target_compile_options(jemalloc PRIVATE -D_GNU_SOURCE)
 
-set_property(TARGET jemalloc APPEND PROPERTY INTERFACE_COMPILE_DEFINITIONS USE_JEMALLOC=1)
-
-message (STATUS "Using jemalloc")
+add_library(ch_contrib::jemalloc ALIAS jemalloc)

contrib/rocksdb-cmake/CMakeLists.txt

@@ -49,9 +49,9 @@ else()
     # but it does not have all the jemalloc files in include/...
     set(WITH_JEMALLOC ON)
   else()
-    if(WITH_JEMALLOC)
+    if(WITH_JEMALLOC AND TARGET ch_contrib::jemalloc)
       add_definitions(-DROCKSDB_JEMALLOC -DJEMALLOC_NO_DEMANGLE)
-      list(APPEND THIRDPARTY_LIBS jemalloc)
+      list(APPEND THIRDPARTY_LIBS ch_contrib::jemalloc)
     endif()
   endif()
 

programs/server/CMakeLists.txt

@@ -18,13 +18,15 @@ set (CLICKHOUSE_SERVER_LINK
         clickhouse_storages_system
         clickhouse_table_functions
         string_utils
-        jemalloc
 
     ${LINK_RESOURCE_LIB}
 
     PUBLIC
         daemon
 )
+if (TARGET ch_contrib::jemalloc)
+    list(APPEND CLICKHOUSE_SERVER_LINK PRIVATE ch_contrib::jemalloc)
+endif()
 
 clickhouse_program_add(server)
 

src/CMakeLists.txt

@@ -177,10 +177,15 @@ if (((SANITIZE STREQUAL "thread") OR (SANITIZE STREQUAL "address")) AND COMPILER
     message(WARNING "Memory tracking is disabled, due to gcc sanitizers")
 else()
     add_library (clickhouse_new_delete STATIC Common/new_delete.cpp)
-    target_link_libraries (clickhouse_new_delete PRIVATE clickhouse_common_io jemalloc)
+    target_link_libraries (clickhouse_new_delete PRIVATE clickhouse_common_io)
+    if (TARGET ch_contrib::jemalloc)
+        target_link_libraries (clickhouse_new_delete PRIVATE ch_contrib::jemalloc)
+    endif()
 endif()
 
-target_link_libraries (clickhouse_common_io PRIVATE jemalloc)
+if (TARGET ch_contrib::jemalloc)
+    target_link_libraries (clickhouse_common_io PRIVATE ch_contrib::jemalloc)
+endif()
 
 add_subdirectory(Access/Common)
 add_subdirectory(Common/ZooKeeper)
@@ -256,12 +261,18 @@ endif()
 
 if (MAKE_STATIC_LIBRARIES OR NOT SPLIT_SHARED_LIBRARIES)
     add_library (dbms STATIC ${dbms_headers} ${dbms_sources})
-    target_link_libraries (dbms PRIVATE jemalloc libdivide ${DBMS_COMMON_LIBRARIES})
+    target_link_libraries (dbms PRIVATE libdivide ${DBMS_COMMON_LIBRARIES})
+    if (TARGET ch_contrib::jemalloc)
+        target_link_libraries (dbms PRIVATE ch_contrib::jemalloc)
+    endif()
     set (all_modules dbms)
 else()
     add_library (dbms SHARED ${dbms_headers} ${dbms_sources})
     target_link_libraries (dbms PUBLIC ${all_modules} ${DBMS_COMMON_LIBRARIES})
-    target_link_libraries (clickhouse_interpreters PRIVATE jemalloc libdivide)
+    target_link_libraries (clickhouse_interpreters PRIVATE libdivide)
+    if (TARGET ch_contrib::jemalloc)
+        target_link_libraries (clickhouse_interpreters PRIVATE ch_contrib::jemalloc)
+    endif()
     list (APPEND all_modules dbms)
     # force all split libs to be linked
     if (OS_DARWIN)

src/Common/config.h.in

@@ -21,3 +21,4 @@
 #cmakedefine01 USE_HIVE
 #cmakedefine01 USE_ODBC
 #cmakedefine01 USE_REPLXX
+#cmakedefine01 USE_JEMALLOC

src/Common/memory.h

@@ -4,12 +4,13 @@
 #include <base/defines.h>
 
 #include <Common/CurrentMemoryTracker.h>
+#include <Common/config.h>
 
 #if USE_JEMALLOC
 #    include <jemalloc/jemalloc.h>
 #endif
 
-#if !USE_JEMALLOC || JEMALLOC_VERSION_MAJOR < 4
+#if !USE_JEMALLOC
 #    include <cstdlib>
 #endif
 
@@ -37,7 +38,7 @@ inline ALWAYS_INLINE void deleteImpl(void * ptr) noexcept
     free(ptr);
 }
 
-#if USE_JEMALLOC && JEMALLOC_VERSION_MAJOR >= 4
+#if USE_JEMALLOC
 
 inline ALWAYS_INLINE void deleteSized(void * ptr, std::size_t size) noexcept
 {
@@ -67,7 +68,7 @@ inline ALWAYS_INLINE size_t getActualAllocationSize(size_t size)
 {
     size_t actual_size = size;
 
-#if USE_JEMALLOC && JEMALLOC_VERSION_MAJOR >= 5
+#if USE_JEMALLOC
     /// The nallocx() function allocates no memory, but it performs the same size computation as the mallocx() function
     /// @note je_mallocx() != je_malloc(). It's expected they don't differ much in allocation logic.
     if (likely(size != 0))
@@ -87,7 +88,7 @@ inline ALWAYS_INLINE void untrackMemory(void * ptr [[maybe_unused]], std::size_t
 {
     try
     {
-#if USE_JEMALLOC && JEMALLOC_VERSION_MAJOR >= 5
+#if USE_JEMALLOC
         /// @note It's also possible to use je_malloc_usable_size() here.
         if (likely(ptr != nullptr))
             CurrentMemoryTracker::free(sallocx(ptr, 0));

src/Common/new_delete.cpp

@@ -1,4 +1,5 @@
 #include <Common/memory.h>
+#include <Common/config.h>
 #include <new>
 
 #if defined(OS_DARWIN) && (USE_JEMALLOC)

src/Core/config_core.h.in

@@ -18,3 +18,4 @@
 #cmakedefine01 USE_FILELOG
 #cmakedefine01 USE_ODBC
 #cmakedefine01 USE_REPLXX
+#cmakedefine01 USE_JEMALLOC

src/configure_config.cmake

@@ -94,3 +94,6 @@ endif()
 if (TARGET ch_contrib::cpuid)
     set(USE_CPUID 1)
 endif()
+if (TARGET ch_contrib::jemalloc)
+    set(USE_JEMALLOC 1)
+endif()