From 5282562117565c54ecf3153901a80a244a0577ba Mon Sep 17 00:00:00 2001
From: Pieter Noordhuis <pcnoordhuis@gmail.com>
Date: Tue, 19 Apr 2011 23:54:43 +0200
Subject: [PATCH] More allocators

---
 src/Makefile | 18 ++++++++++++++++--
 src/config.h |  7 +++++++
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/src/Makefile b/src/Makefile
index 00bdf481..d542c342 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -16,9 +16,23 @@ else
 endif
 
 ifeq ($(USE_TCMALLOC),yes)
-  CCLINK+= -ltcmalloc
-  CFLAGS+= -DUSE_TCMALLOC
+  ALLOC_LINK=-ltcmalloc
+  ALLOC_FLAGS=-DUSE_TCMALLOC
 endif
+
+ifeq ($(USE_TCMALLOC_MINIMAL),yes)
+  ALLOC_LINK=-ltcmalloc_minimal
+  ALLOC_FLAGS=-DUSE_TCMALLOC
+endif
+
+ifeq ($(USE_JEMALLOC),yes)
+  ALLOC_LINK=-ljemalloc
+  ALLOC_FLAGS=-DUSE_JEMALLOC
+endif
+
+CCLINK+= $(ALLOC_LINK)
+CFLAGS+= $(ALLOC_FLAGS)
+
 CCOPT= $(CFLAGS) $(CCLINK) $(ARCH) $(PROF)
 
 PREFIX= /usr/local
diff --git a/src/config.h b/src/config.h
index d98067c1..7e1133ec 100644
--- a/src/config.h
+++ b/src/config.h
@@ -15,6 +15,13 @@
 #define HAVE_MALLOC_SIZE 1
 #define redis_malloc_size(p) tc_malloc_size(p)
 #endif
+#elif defined(USE_JEMALLOC)
+#define JEMALLOC_MANGLE
+#include <jemalloc/jemalloc.h>
+#if JEMALLOC_VERSION_MAJOR >= 2 && JEMALLOC_VERSION_MINOR >= 1
+#define HAVE_MALLOC_SIZE 1
+#define redis_malloc_size(p) JEMALLOC_P(malloc_usable_size)(p)
+#endif
 #elif defined(__APPLE__)
 #include <malloc/malloc.h>
 #define HAVE_MALLOC_SIZE 1
-- 
2.47.2