Add support for compiling with mimalloc

src/Makefile

@@ -98,6 +98,10 @@ ifeq ($(USE_JEMALLOC),no)
 	MALLOC=libc
 endif
 
+ifeq ($(USE_MIMALLOC),yes)
+	MALLOC=mimalloc
+endif
+
 ifdef SANITIZER
 ifeq ($(SANITIZER),address)
 	MALLOC=libc
@@ -285,6 +289,13 @@ ifeq ($(MALLOC),jemalloc)
 	FINAL_LIBS := ../deps/jemalloc/lib/libjemalloc.a $(FINAL_LIBS)
 endif
 
+ifeq ($(MALLOC),mimalloc)
+	FINAL_CFLAGS+= -DUSE_MIMALLOC -I/usr/local/include
+	FINAL_LDFLAGS+= -L/usr/local/lib
+	FINAL_LIBS := -lmimalloc $(FINAL_LIBS)
+endif
+
+
 # LIBSSL & LIBCRYPTO
 LIBSSL_LIBS=
 LIBSSL_PKGCONFIG := $(shell $(PKG_CONFIG) --exists libssl && echo $$?)

src/zmalloc.c

@@ -85,6 +85,12 @@ void zlibc_free(void *ptr) {
 #define free(ptr) je_free(ptr)
 #define mallocx(size,flags) je_mallocx(size,flags)
 #define dallocx(ptr,flags) je_dallocx(ptr,flags)
+/* Explicitly override malloc/free etc when using mimalloc. */
+#elif defined(USE_MIMALLOC)
+#define malloc(size) mi_malloc(size)
+#define calloc(count,size) mi_calloc(count,size)
+#define realloc(ptr,size) mi_realloc(ptr,size)
+#define free(ptr) mi_free(ptr)
 #endif
 
 #define update_zmalloc_stat_alloc(__n) atomicIncr(used_memory,(__n))

src/zmalloc.h

@@ -34,6 +34,9 @@
 /* Double expansion needed for stringification of macro values. */
 #define __xstr(s) __str(s)
 #define __str(s) #s
+#define MI_VERSION_MAJOR 1
+#define MI_VERSION_MINOR 8
+#define MI_VERSION_PATCH 5
 
 #if defined(USE_TCMALLOC)
 #define ZMALLOC_LIB ("tcmalloc-" __xstr(TC_VERSION_MAJOR) "." __xstr(TC_VERSION_MINOR))
@@ -55,6 +58,16 @@
 #error "Newer version of jemalloc required"
 #endif
 
+#elif defined(USE_MIMALLOC)
+#define ZMALLOC_LIB ("mimalloc-" __xstr(MI_VERSION_MAJOR) "." __xstr(MI_VERSION_MINOR) "." __xstr(MI_VERSION_PATCH))
+#include <mimalloc.h>
+#if (MI_VERSION_MAJOR == 1 && MI_VERSION_MINOR >= 8) || (MI_VERSION_MAJOR > 1)
+#define HAVE_MALLOC_SIZE 1
+#define zmalloc_size(p) mi_usable_size(p)
+#else
+#error "Newer version of mimalloc required"
+#endif
+
 #elif defined(__APPLE__)
 #include <malloc/malloc.h>
 #define HAVE_MALLOC_SIZE 1