Apply patch to jemalloc

Signed-off-by: Lukasz Dorau <[email protected]>

Author: ldorau

CMakeLists.txt

@@ -139,6 +139,30 @@ else()
         GIT_TAG ${UMF_JEMALLOC_TAG})
     FetchContent_MakeAvailable(jemalloc_targ)
 
+    if(jemalloc_targ_SOURCE_DIR)
+        # apply patch for jemalloc
+        execute_process(
+            COMMAND
+                git apply
+                ${PROJECT_SOURCE_DIR}/cmake/replace-free_default-with-umf_free_default.patch
+            WORKING_DIRECTORY ${jemalloc_targ_SOURCE_DIR}
+            OUTPUT_VARIABLE UMF_JEMALLOC_PATCH_OUTPUT
+            ERROR_VARIABLE UMF_JEMALLOC_PATCH_ERROR)
+
+        if(UMF_JEMALLOC_PATCH_OUTPUT)
+            message(
+                STATUS
+                    "jemalloc patch command output:\n${UMF_JEMALLOC_PATCH_OUTPUT}"
+            )
+        endif()
+        if(UMF_JEMALLOC_PATCH_ERROR)
+            message(
+                WARNING
+                    "jemalloc patch command output:\n${UMF_JEMALLOC_PATCH_ERROR}"
+            )
+        endif()
+    endif()
+
     add_custom_command(
         COMMAND ./autogen.sh
         WORKING_DIRECTORY ${jemalloc_targ_SOURCE_DIR}

cmake/replace-free_default-with-umf_free_default.patch

@@ -0,0 +1,25 @@
+diff --git a/src/jemalloc.c b/src/jemalloc.c
+index 7655de4e..ccb50b4f 100644
+--- a/src/jemalloc.c
++++ b/src/jemalloc.c
+@@ -2993,7 +2993,7 @@ isfree(tsd_t *tsd, void *ptr, size_t usize, tcache_t *tcache, bool slow_path) {
+ 
+ JEMALLOC_NOINLINE
+ void
+-free_default(void *ptr) {
++umf_free_default(void *ptr) {
+ 	UTRACE(ptr, 0, 0);
+ 	if (likely(ptr != NULL)) {
+ 		/*
+@@ -3159,7 +3159,7 @@ je_free(void *ptr) {
+ 	LOG("core.free.entry", "ptr: %p", ptr);
+ 
+ 	if (!free_fastpath(ptr, 0, false)) {
+-		free_default(ptr);
++		umf_free_default(ptr);
+ 	}
+ 
+ 	LOG("core.free.exit", "");
+-- 
+2.34.1
+