added diskstore.c, currently just a stub

[redis.git] / src / config.h

diff --git a/src/config.h b/src/config.h
index 62f808f5d6a1d8b6ee4d73a41c353883a1a55a48..40f22fa515fae6d06f363c71dd7f15c9fb04c522 100644 (file)
--- a/src/config.h
+++ b/src/config.h
@@ -5,17 +5,17 @@
 #include <AvailabilityMacros.h>
 #endif
 
 #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
 #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)
 #include <malloc/malloc.h>
 #define HAVE_MALLOC_SIZE 1
 #define redis_malloc_size(p) malloc_size(p)