Marginally more robust glibc version test for sync_file_range detection.

[redis.git] / src / config.h

diff --git a/src/config.h b/src/config.h
index 07700bed6e82344b940aa74c6d1de4481a26b4cb..5e6d2807271cd04266522fcfd8f0f665b61670f2 100644 (file)
--- a/src/config.h
+++ b/src/config.h
@@ -5,23 +5,7 @@
 #include <AvailabilityMacros.h>
 #endif
 
 #include <AvailabilityMacros.h>
 #endif
 

-/* 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
-#elif defined(__APPLE__)
-#include <malloc/malloc.h>
-#define HAVE_MALLOC_SIZE 1
-#define redis_malloc_size(p) malloc_size(p)
-#endif
-
-/* Tefine redis_fstat to fstat or fstat64() */
+/* Define redis_fstat to fstat or fstat64() */

 #if defined(__APPLE__) && !defined(MAC_OS_X_VERSION_10_6)
 #define redis_fstat fstat64
 #define redis_stat stat64
 #if defined(__APPLE__) && !defined(MAC_OS_X_VERSION_10_6)
 #define redis_fstat fstat64
 #define redis_stat stat64


@@ -41,7 +25,7 @@
 #endif
 
 /* Test for backtrace() */
 #endif
 
 /* Test for backtrace() */

-#if defined(__APPLE__) || defined(__linux__)
+#if defined(__APPLE__) || defined(__linux__) || defined(__sun)

 #define HAVE_BACKTRACE 1
 #endif
 
 #define HAVE_BACKTRACE 1
 #endif
 


@@ -54,6 +38,13 @@
 #define HAVE_KQUEUE 1
 #endif
 
 #define HAVE_KQUEUE 1
 #endif
 

+#ifdef __sun
+#include <sys/feature_tests.h>
+#ifdef _DTRACE_VERSION
+#define HAVE_EVPORT 1
+#endif
+#endif
+

 /* Define aof_fsync to fdatasync() in Linux and fsync() for all the rest */
 #ifdef __linux__
 #define aof_fsync fdatasync
 /* Define aof_fsync to fdatasync() in Linux and fsync() for all the rest */
 #ifdef __linux__
 #define aof_fsync fdatasync


@@ -61,6 +52,28 @@
 #define aof_fsync fsync
 #endif
 
 #define aof_fsync fsync
 #endif
 

+/* Define rdb_fsync_range to sync_file_range() on Linux, otherwise we use
+ * the plain fsync() call. */
+#ifdef __linux__
+#include <linux/version.h>
+#include <features.h>
+#if defined(__GLIBC__) && defined(__GLIBC_PREREQ)
+#if (LINUX_VERSION_CODE >= 0x020611 && __GLIBC_PREREQ(2, 6))
+#define HAVE_SYNC_FILE_RANGE 1
+#endif
+#else
+#if (LINUX_VERSION_CODE >= 0x020611)
+#define HAVE_SYNC_FILE_RANGE 1
+#endif
+#endif
+#endif
+
+#ifdef HAVE_SYNC_FILE_RANGE
+#define rdb_fsync_range(fd,off,size) sync_file_range(fd,off,size,SYNC_FILE_RANGE_WAIT_BEFORE|SYNC_FILE_RANGE_WRITE)
+#else
+#define rdb_fsync_range(fd,off,size) fsync(fd)
+#endif
+

 /* Byte ordering detection */
 #include <sys/types.h> /* This will likely define BYTE_ORDER */
 
 /* Byte ordering detection */
 #include <sys/types.h> /* This will likely define BYTE_ORDER */
 


@@ -75,10 +88,11 @@
 #define        BIG_ENDIAN      4321    /* most-significant byte first (IBM, net) */
 #define        PDP_ENDIAN      3412    /* LSB first in word, MSW first in long (pdp)*/
 
 #define        BIG_ENDIAN      4321    /* most-significant byte first (IBM, net) */
 #define        PDP_ENDIAN      3412    /* LSB first in word, MSW first in long (pdp)*/
 

-#if defined(vax) || defined(ns32000) || defined(sun386) || defined(__i386__) || \
-    defined(MIPSEL) || defined(_MIPSEL) || defined(BIT_ZERO_ON_RIGHT) || \
-    defined(__alpha__) || defined(__alpha)
-#define BYTE_ORDER     LITTLE_ENDIAN
+#if defined(__i386__) || defined(__x86_64__) || defined(__amd64__) || \
+   defined(vax) || defined(ns32000) || defined(sun386) || \
+   defined(MIPSEL) || defined(_MIPSEL) || defined(BIT_ZERO_ON_RIGHT) || \
+   defined(__alpha__) || defined(__alpha)
+#define BYTE_ORDER    LITTLE_ENDIAN

 #endif
 
 #if defined(sel) || defined(pyr) || defined(mc68000) || defined(sparc) || \
 #endif
 
 #if defined(sel) || defined(pyr) || defined(mc68000) || defined(sparc) || \


@@ -103,8 +117,7 @@
 #endif
 
 #if !defined(BYTE_ORDER) || \
 #endif
 
 #if !defined(BYTE_ORDER) || \

-    (BYTE_ORDER != BIG_ENDIAN && BYTE_ORDER != LITTLE_ENDIAN && \
-    BYTE_ORDER != PDP_ENDIAN)
+    (BYTE_ORDER != BIG_ENDIAN && BYTE_ORDER != LITTLE_ENDIAN)

        /* you must determine what the correct bit order is for
         * your compiler - the next line is an intentional error
         * which will force your compiles to bomb until you fix
        /* you must determine what the correct bit order is for
         * your compiler - the next line is an intentional error
         * which will force your compiles to bomb until you fix


@@ -113,4 +126,12 @@
 #error "Undefined or invalid BYTE_ORDER"
 #endif
 
 #error "Undefined or invalid BYTE_ORDER"
 #endif
 

+#if (__i386 || __amd64) && __GNUC__
+#define GNUC_VERSION (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__)
+#if GNUC_VERSION >= 40100
+#define HAVE_ATOMIC
+#endif
+#endif
+
+

 #endif
 #endif