Change jemalloc prefix from je_ to je_umf_

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

Author: ldorau

CMakeLists.txt

@@ -146,8 +146,8 @@ else()
     add_custom_command(
         COMMAND
             ./configure --prefix=${jemalloc_targ_BINARY_DIR}
-            --with-jemalloc-prefix=je_ --disable-initial-exec-tls CFLAGS=-fPIC
-            CXXFLAGS=-fPIC
+            --with-jemalloc-prefix=je_umf_ --disable-initial-exec-tls
+            CFLAGS=-fPIC CXXFLAGS=-fPIC
         WORKING_DIRECTORY ${jemalloc_targ_SOURCE_DIR}
         OUTPUT ${jemalloc_targ_SOURCE_DIR}/Makefile
         DEPENDS ${jemalloc_targ_SOURCE_DIR}/configure)

src/pool/pool_jemalloc.c

@@ -24,6 +24,14 @@
 
 #define MALLOCX_ARENA_MAX (MALLCTL_ARENAS_ALL - 1)
 
+#ifdef _WIN32
+#define je_umf_mallocx je_mallocx
+#define je_umf_dallocx je_dallocx
+#define je_umf_rallocx je_rallocx
+#define je_umf_mallctl je_mallctl
+#define je_umf_malloc_usable_size je_malloc_usable_size
+#endif
+
 typedef struct jemalloc_memory_pool_t {
     umf_memory_provider_handle_t provider;
     unsigned int arena_index; // index of jemalloc arena
@@ -349,7 +357,7 @@ static void *op_malloc(void *pool, size_t size) {
     // MALLOCX_TCACHE_NONE is set, because jemalloc can mix objects from different arenas inside
     // the tcache, so we wouldn't be able to guarantee isolation of different providers.
     int flags = MALLOCX_ARENA(je_pool->arena_index) | MALLOCX_TCACHE_NONE;
-    void *ptr = je_mallocx(size, flags);
+    void *ptr = je_umf_mallocx(size, flags);
     if (ptr == NULL) {
         TLS_last_allocation_error = UMF_RESULT_ERROR_OUT_OF_HOST_MEMORY;
         return NULL;
@@ -366,7 +374,7 @@ static umf_result_t op_free(void *pool, void *ptr) {
 
     if (ptr != NULL) {
         VALGRIND_DO_MEMPOOL_FREE(pool, ptr);
-        je_dallocx(ptr, MALLOCX_TCACHE_NONE);
+        je_umf_dallocx(ptr, MALLOCX_TCACHE_NONE);
     }
 
     return UMF_RESULT_SUCCESS;
@@ -390,7 +398,7 @@ static void *op_calloc(void *pool, size_t num, size_t size) {
 static void *op_realloc(void *pool, void *ptr, size_t size) {
     assert(pool);
     if (size == 0 && ptr != NULL) {
-        je_dallocx(ptr, MALLOCX_TCACHE_NONE);
+        je_umf_dallocx(ptr, MALLOCX_TCACHE_NONE);
         TLS_last_allocation_error = UMF_RESULT_SUCCESS;
         VALGRIND_DO_MEMPOOL_FREE(pool, ptr);
         return NULL;
@@ -402,7 +410,7 @@ static void *op_realloc(void *pool, void *ptr, size_t size) {
     // MALLOCX_TCACHE_NONE is set, because jemalloc can mix objects from different arenas inside
     // the tcache, so we wouldn't be able to guarantee isolation of different providers.
     int flags = MALLOCX_ARENA(je_pool->arena_index) | MALLOCX_TCACHE_NONE;
-    void *new_ptr = je_rallocx(ptr, size, flags);
+    void *new_ptr = je_umf_rallocx(ptr, size, flags);
     if (new_ptr == NULL) {
         TLS_last_allocation_error = UMF_RESULT_ERROR_OUT_OF_HOST_MEMORY;
         return NULL;
@@ -427,7 +435,7 @@ static void *op_aligned_alloc(void *pool, size_t size, size_t alignment) {
     // the tcache, so we wouldn't be able to guarantee isolation of different providers.
     int flags =
         MALLOCX_ALIGN(alignment) | MALLOCX_ARENA(arena) | MALLOCX_TCACHE_NONE;
-    void *ptr = je_mallocx(size, flags);
+    void *ptr = je_umf_mallocx(size, flags);
     if (ptr == NULL) {
         TLS_last_allocation_error = UMF_RESULT_ERROR_OUT_OF_HOST_MEMORY;
         return NULL;
@@ -465,8 +473,8 @@ static umf_result_t op_initialize(umf_memory_provider_handle_t provider,
     }
 
     unsigned arena_index;
-    err = je_mallctl("arenas.create", (void *)&arena_index, &unsigned_size,
-                     NULL, 0);
+    err = je_umf_mallctl("arenas.create", (void *)&arena_index, &unsigned_size,
+                         NULL, 0);
     if (err) {
         LOG_ERR("Could not create arena.");
         goto err_free_pool;
@@ -475,10 +483,10 @@ static umf_result_t op_initialize(umf_memory_provider_handle_t provider,
     // setup extent_hooks for newly created arena
     char cmd[64];
     snprintf(cmd, sizeof(cmd), "arena.%u.extent_hooks", arena_index);
-    err = je_mallctl(cmd, NULL, NULL, (void *)&pHooks, sizeof(void *));
+    err = je_umf_mallctl(cmd, NULL, NULL, (void *)&pHooks, sizeof(void *));
     if (err) {
         snprintf(cmd, sizeof(cmd), "arena.%u.destroy", arena_index);
-        je_mallctl(cmd, NULL, 0, NULL, 0);
+        je_umf_mallctl(cmd, NULL, 0, NULL, 0);
         LOG_ERR("Could not setup extent_hooks for newly created arena.");
         goto err_free_pool;
     }
@@ -502,7 +510,7 @@ static void op_finalize(void *pool) {
     jemalloc_memory_pool_t *je_pool = (jemalloc_memory_pool_t *)pool;
     char cmd[64];
     snprintf(cmd, sizeof(cmd), "arena.%u.destroy", je_pool->arena_index);
-    je_mallctl(cmd, NULL, 0, NULL, 0);
+    je_umf_mallctl(cmd, NULL, 0, NULL, 0);
     pool_by_arena_index[je_pool->arena_index] = NULL;
     umf_ba_global_free(je_pool);
 
@@ -511,7 +519,7 @@ static void op_finalize(void *pool) {
 
 static size_t op_malloc_usable_size(void *pool, void *ptr) {
     (void)pool; // not used
-    return je_malloc_usable_size(ptr);
+    return je_umf_malloc_usable_size(ptr);
 }
 
 static umf_result_t op_get_last_allocation_error(void *pool) {