diff options
| author | Pieter Noordhuis <pcnoordhuis@gmail.com> | 2010-10-23 10:18:48 +0200 |
|---|---|---|
| committer | Pieter Noordhuis <pcnoordhuis@gmail.com> | 2010-10-23 10:18:48 +0200 |
| commit | d94ac406ba8061f3ac3cdda2bb372367d736a3fc (patch) | |
| tree | 7d4d8cfc155626aacea103b4bd66f8848b4d2f69 /src | |
| parent | 7cdc98b6305bb65aee5f5973e8123246755dac7d (diff) | |
| download | redis-d94ac406ba8061f3ac3cdda2bb372367d736a3fc.tar.gz | |
Exclusively use either tcmalloc or OSX's native malloc_size()
Diffstat (limited to 'src')
| -rw-r--r-- | src/config.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/config.h b/src/config.h index 62f808f5d..40f22fa51 100644 --- a/src/config.h +++ b/src/config.h @@ -5,17 +5,17 @@ #include <AvailabilityMacros.h> #endif -/* use tcmalloc's malloc_size() when available */ +/* Use tcmalloc's malloc_size() when available. + * When tcmalloc is used, native OSX malloc_size() may never be used because + * this expects a different allocation scheme. Therefore, *exclusively* use + * either tcmalloc or OSX's malloc_size()! */ #if defined(USE_TCMALLOC) #include <google/tcmalloc.h> #if TC_VERSION_MAJOR >= 1 && TC_VERSION_MINOR >= 6 #define HAVE_MALLOC_SIZE 1 #define redis_malloc_size(p) tc_malloc_size(p) #endif -#endif - -/* fallback to native malloc_size() for osx */ -#if defined(__APPLE__) && !defined(HAVE_MALLOC_SIZE) +#elif defined(__APPLE__) #include <malloc/malloc.h> #define HAVE_MALLOC_SIZE 1 #define redis_malloc_size(p) malloc_size(p) |