[CMake] Expand support for preinstalled jemalloc

Signed-off-by: Sarnie, Nick <[email protected]>

Author: sarnex

CMakeLists.txt

@@ -155,36 +155,37 @@ if(NOT UMF_BUILD_LIBUMF_POOL_JEMALLOC)
     set(UMF_POOL_JEMALLOC_ENABLED FALSE)
     set(JEMALLOC_FOUND FALSE)
     set(JEMALLOC_LIBRARIES FALSE)
-elseif(WINDOWS)
-    pkg_check_modules(JEMALLOC jemalloc)
+  else()
+    set(JEMALLOC_VER 5.3.0)
+    pkg_check_modules(JEMALLOC QUIET jemalloc)
     if(NOT JEMALLOC_FOUND)
-        find_package(JEMALLOC REQUIRED jemalloc)
+        find_package(JEMALLOC ${JEMALLOC_VER} QUIET)
     endif()
-else()
-    if(NOT DEFINED UMF_JEMALLOC_REPO)
+    if(NOT JEMALLOC_FOUND)
+      if(NOT DEFINED UMF_JEMALLOC_REPO)
         set(UMF_JEMALLOC_REPO "https://github.com/jemalloc/jemalloc.git")
-    endif()
+      endif()
 
-    if(NOT DEFINED UMF_JEMALLOC_TAG)
-        set(UMF_JEMALLOC_TAG 5.3.0)
-    endif()
+      if(NOT DEFINED UMF_JEMALLOC_TAG)
+        set(UMF_JEMALLOC_TAG ${JEMALLOC_VER})
+      endif()
 
-    message(
+      message(
         STATUS
-            "Will fetch jemalloc from ${UMF_JEMALLOC_REPO} (tag: ${UMF_JEMALLOC_TAG})"
-    )
+        "Will fetch jemalloc from ${UMF_JEMALLOC_REPO} (tag: ${UMF_JEMALLOC_TAG})"
+        )
 
-    FetchContent_Declare(
+      FetchContent_Declare(
         jemalloc_targ
         GIT_REPOSITORY ${UMF_JEMALLOC_REPO}
         GIT_TAG ${UMF_JEMALLOC_TAG})
-    FetchContent_MakeAvailable(jemalloc_targ)
+      FetchContent_MakeAvailable(jemalloc_targ)
 
-    add_custom_command(
+      add_custom_command(
         COMMAND ./autogen.sh
         WORKING_DIRECTORY ${jemalloc_targ_SOURCE_DIR}
         OUTPUT ${jemalloc_targ_SOURCE_DIR}/configure)
-    add_custom_command(
+      add_custom_command(
         # Custom jemalloc build. Non-default options used:
         # --with-jemalloc-prefix=je_ - add je_ prefix to all public APIs
         # --disable-cxx - Disable C++ integration. This will cause new and
@@ -195,39 +196,40 @@ else()
         # loaded after program startup (e.g. using dlopen). --disable-doc -
         # Disable building and installing the documentation.
         COMMAND
-            ./configure --prefix=${jemalloc_targ_BINARY_DIR}
-            --with-jemalloc-prefix=je_ --disable-cxx --disable-initial-exec-tls
-            --disable-doc CFLAGS=-fPIC
+        ./configure --prefix=${jemalloc_targ_BINARY_DIR}
+        --with-jemalloc-prefix=je_ --disable-cxx --disable-initial-exec-tls
+        --disable-doc CFLAGS=-fPIC
         WORKING_DIRECTORY ${jemalloc_targ_SOURCE_DIR}
         OUTPUT ${jemalloc_targ_SOURCE_DIR}/Makefile
         DEPENDS ${jemalloc_targ_SOURCE_DIR}/configure)
 
-    if(NOT UMF_QEMU_BUILD)
+      if(NOT UMF_QEMU_BUILD)
         set(MAKE_ARGUMENTS "-j$(nproc)")
-    endif()
+      endif()
 
-    add_custom_command(
+      add_custom_command(
         COMMAND make ${MAKE_ARGUMENTS}
         WORKING_DIRECTORY ${jemalloc_targ_SOURCE_DIR}
         OUTPUT ${jemalloc_targ_SOURCE_DIR}/lib/libjemalloc.a
         DEPENDS ${jemalloc_targ_SOURCE_DIR}/Makefile)
-    add_custom_command(
+      add_custom_command(
         COMMAND make install
         WORKING_DIRECTORY ${jemalloc_targ_SOURCE_DIR}
         OUTPUT ${jemalloc_targ_BINARY_DIR}/lib/libjemalloc.a
         DEPENDS ${jemalloc_targ_SOURCE_DIR}/lib/libjemalloc.a)
 
-    add_custom_target(jemalloc_prod
-                      DEPENDS ${jemalloc_targ_BINARY_DIR}/lib/libjemalloc.a)
-    add_library(jemalloc INTERFACE)
-    target_link_libraries(
+      add_custom_target(jemalloc_prod
+        DEPENDS ${jemalloc_targ_BINARY_DIR}/lib/libjemalloc.a)
+      add_library(jemalloc INTERFACE)
+      target_link_libraries(
         jemalloc INTERFACE ${jemalloc_targ_BINARY_DIR}/lib/libjemalloc.a)
-    add_dependencies(jemalloc jemalloc_prod)
+      add_dependencies(jemalloc jemalloc_prod)
 
-    set(JEMALLOC_FOUND TRUE)
-    set(JEMALLOC_LIBRARY_DIRS ${jemalloc_targ_BINARY_DIR}/lib)
-    set(JEMALLOC_INCLUDE_DIRS ${jemalloc_targ_BINARY_DIR}/include)
-    set(JEMALLOC_LIBRARIES ${jemalloc_targ_BINARY_DIR}/lib/libjemalloc.a)
+      set(JEMALLOC_FOUND TRUE)
+      set(JEMALLOC_LIBRARY_DIRS ${jemalloc_targ_BINARY_DIR}/lib)
+      set(JEMALLOC_INCLUDE_DIRS ${jemalloc_targ_BINARY_DIR}/include)
+      set(JEMALLOC_LIBRARIES ${jemalloc_targ_BINARY_DIR}/lib/libjemalloc.a)
+  endif()
 endif()
 
 if(JEMALLOC_FOUND)

src/CMakeLists.txt

@@ -75,7 +75,8 @@ if(UMF_POOL_JEMALLOC_ENABLED)
     set(UMF_PRIVATE_INCLUDE_DIRS ${UMF_PRIVATE_INCLUDE_DIRS}
                                  ${JEMALLOC_INCLUDE_DIRS})
     set(UMF_COMMON_COMPILE_DEFINITIONS ${UMF_COMMON_COMPILE_DEFINITIONS}
-                                       "UMF_POOL_JEMALLOC_ENABLED=1")
+                                         "UMF_POOL_JEMALLOC_ENABLED=1"
+                                         "USING_PREBUILT_JEMALLOC=${JEMALLOC_FOUND}")
 endif()
 
 set(UMF_PRIVATE_LIBRARY_DIRS ${UMF_PRIVATE_LIBRARY_DIRS}
@@ -166,7 +167,7 @@ if(UMF_LINK_HWLOC_STATICALLY)
     endif()
 endif()
 
-if(NOT WINDOWS AND UMF_POOL_JEMALLOC_ENABLED)
+if(UMF_POOL_JEMALLOC_ENABLED AND TARGET jemalloc)
     add_dependencies(umf jemalloc)
 endif()
 

src/pool/pool_jemalloc.c

@@ -59,6 +59,24 @@ umfJemallocPoolParamsSetName(umf_jemalloc_pool_params_handle_t hParams,
 #define MALLOCX_ARENA_MAX (MALLCTL_ARENAS_ALL - 1)
 #define DEFAULT_NAME "jemalloc"
 
+#ifdef USING_PREBUILT_JEMALLOC
+
+// When jemalloc is built in-tree, it is configured such that
+// all symbols are prepended with the je_ prefix. This is not
+// the case for system-installed jemalloc.
+
+#define je_mallctl(...) mallctl(__VA_ARGS__)
+
+#define je_mallocx(...) mallocx(__VA_ARGS__)
+
+#define je_dallocx(...) dallocx(__VA_ARGS__)
+
+#define je_rallocx(...) rallocx(__VA_ARGS__)
+
+#define je_malloc_usable_size(...) malloc_usable_size(__VA_ARGS__)
+
+#endif
+
 typedef struct umf_jemalloc_pool_params_t {
     size_t n_arenas;
     char name[64];
@@ -678,4 +696,13 @@ umfJemallocPoolParamsSetName(umf_jemalloc_pool_params_handle_t hParams,
     return UMF_RESULT_SUCCESS;
 }
 
+
+#ifdef USING_PREBUILT_JEMALLOC
+#undef je_mallctl
+#undef je_mallocx
+#undef je_dallocx
+#undef je_rallocx
+#undef je_malloc_usable_size
+#endif
+
 #endif /* UMF_POOL_JEMALLOC_ENABLED */