diff --git a/deps/Makefile b/deps/Makefile index 345e1f703..9a273aefc 100644 --- a/deps/Makefile +++ b/deps/Makefile @@ -39,9 +39,7 @@ distclean: -(cd hiredict && $(MAKE) clean) > /dev/null || true -(cd linenoise && $(MAKE) clean) > /dev/null || true -(cd lua && $(MAKE) clean) > /dev/null || true -ifneq ($(USE_SYSTEM_JEMALLOC),yes) -(cd jemalloc && [ -f Makefile ] && $(MAKE) distclean) > /dev/null || true -endif -(cd hdr_histogram && $(MAKE) clean) > /dev/null || true -(cd fpconv && $(MAKE) clean) > /dev/null || true -(rm -f .make-*) diff --git a/src/Makefile b/src/Makefile index b3e61b9e8..0739466b6 100644 --- a/src/Makefile +++ b/src/Makefile @@ -266,15 +266,10 @@ ifeq ($(MALLOC),tcmalloc_minimal) endif ifeq ($(MALLOC),jemalloc) -ifeq ($(USE_SYSTEM_JEMALLOC),yes) - FINAL_CFLAGS+= -DUSE_JEMALLOC -I/usr/include/jemalloc/include - FINAL_LIBS := -ljemalloc $(FINAL_LIBS) -else DEPENDENCY_TARGETS+= jemalloc FINAL_CFLAGS+= -DUSE_JEMALLOC -I../deps/jemalloc/include FINAL_LIBS := ../deps/jemalloc/lib/libjemalloc.a $(FINAL_LIBS) endif -endif # LIBSSL & LIBCRYPTO LIBSSL_LIBS= diff --git a/src/debug.c b/src/debug.c index e3c13d4e2..89d33bfd7 100644 --- a/src/debug.c +++ b/src/debug.c @@ -56,10 +56,6 @@ void bugReportEnd(int killViaSignal, int sig); void logStackTrace(void *eip, int uplevel, int current_thread); void sigalrmSignalHandler(int sig, siginfo_t *info, void *secret); -#if defined(USE_JEMALLOC) && (USE_SYSTEM_JEMALLOC == yes) -#define je_mallctl mallctl -#endif - /* ================================= Debugging ============================== */ /* Compute the sha1 of string at 's' with 'len' bytes long. diff --git a/src/object.c b/src/object.c index e7e815386..cf7811e81 100644 --- a/src/object.c +++ b/src/object.c @@ -15,11 +15,6 @@ #define strtold(a,b) ((long double)strtod((a),(b))) #endif -#if defined(USE_JEMALLOC) && (USE_SYSTEM_JEMALLOC == yes) -#define je_mallctl mallctl -#define je_malloc_stats_print malloc_stats_print -#endif - /* ===================== Creation and parsing of objects ==================== */ robj *createObject(int type, void *ptr) { diff --git a/src/sds.c b/src/sds.c index 51b30d60c..0a295132c 100644 --- a/src/sds.c +++ b/src/sds.c @@ -24,10 +24,6 @@ #include "sds.h" #include "sdsalloc.h" -#if USE_SYSTEM_JEMALLOC == yes -#define je_nallocx nallocx -#endif - const char *SDS_NOINIT = "SDS_NOINIT"; static inline int sdsHdrSize(char type) { diff --git a/src/zmalloc.c b/src/zmalloc.c index 34512ee5c..d737e2b14 100644 --- a/src/zmalloc.c +++ b/src/zmalloc.c @@ -56,15 +56,6 @@ void zlibc_free(void *ptr) { #define free(ptr) tc_free(ptr) /* Explicitly override malloc/free etc when using jemalloc. */ #elif defined(USE_JEMALLOC) -#if USE_SYSTEM_JEMALLOC == yes -#define malloc(size) malloc(size) -#define calloc(count,size) calloc(count,size) -#define realloc(ptr,size) realloc(ptr,size) -#define free(ptr) free(ptr) -#define mallocx(size,flags) mallocx(size,flags) -#define dallocx(ptr,flags) dallocx(ptr,flags) -#define je_mallctl mallctl -#else #define malloc(size) je_malloc(size) #define calloc(count,size) je_calloc(count,size) #define realloc(ptr,size) je_realloc(ptr,size) @@ -72,7 +63,6 @@ void zlibc_free(void *ptr) { #define mallocx(size,flags) je_mallocx(size,flags) #define dallocx(ptr,flags) je_dallocx(ptr,flags) #endif -#endif #define update_zmalloc_stat_alloc(__n) atomicIncr(used_memory,(__n)) #define update_zmalloc_stat_free(__n) atomicDecr(used_memory,(__n)) diff --git a/src/zmalloc.h b/src/zmalloc.h index 65944e3f7..df7d290da 100644 --- a/src/zmalloc.h +++ b/src/zmalloc.h @@ -27,11 +27,7 @@ #include #if (JEMALLOC_VERSION_MAJOR == 2 && JEMALLOC_VERSION_MINOR >= 1) || (JEMALLOC_VERSION_MAJOR > 2) #define HAVE_MALLOC_SIZE 1 -#if USE_SYSTEM_JEMALLOC == yes -#define zmalloc_size(p) malloc_usable_size(p) -#else #define zmalloc_size(p) je_malloc_usable_size(p) -#endif #else #error "Newer version of jemalloc required" #endif