Fix overflow in mstime() in redis-cli and benchmark.

[redis.git] / src / zmalloc.h

diff --git a/src/zmalloc.h b/src/zmalloc.h
index 7ee556a37b59ec106dd3a68d8c31f7fe22d07318..331d8e4335ffba10a96eb7d6dcd9e38ff1c18f50 100644 (file)
--- a/src/zmalloc.h
+++ b/src/zmalloc.h
@@ -38,7 +38,7 @@
 #if defined(USE_TCMALLOC)
 #define ZMALLOC_LIB ("tcmalloc-" __xstr(TC_VERSION_MAJOR) "." __xstr(TC_VERSION_MINOR))
 #include <google/tcmalloc.h>
 #if defined(USE_TCMALLOC)
 #define ZMALLOC_LIB ("tcmalloc-" __xstr(TC_VERSION_MAJOR) "." __xstr(TC_VERSION_MINOR))
 #include <google/tcmalloc.h>

-#if TC_VERSION_MAJOR >= 1 && TC_VERSION_MINOR >= 6
+#if (TC_VERSION_MAJOR == 1 && TC_VERSION_MINOR >= 6) || (TC_VERSION_MAJOR > 1)

 #define HAVE_MALLOC_SIZE 1
 #define zmalloc_size(p) tc_malloc_size(p)
 #else
 #define HAVE_MALLOC_SIZE 1
 #define zmalloc_size(p) tc_malloc_size(p)
 #else


@@ -47,11 +47,10 @@
 
 #elif defined(USE_JEMALLOC)
 #define ZMALLOC_LIB ("jemalloc-" __xstr(JEMALLOC_VERSION_MAJOR) "." __xstr(JEMALLOC_VERSION_MINOR) "." __xstr(JEMALLOC_VERSION_BUGFIX))
 
 #elif defined(USE_JEMALLOC)
 #define ZMALLOC_LIB ("jemalloc-" __xstr(JEMALLOC_VERSION_MAJOR) "." __xstr(JEMALLOC_VERSION_MINOR) "." __xstr(JEMALLOC_VERSION_BUGFIX))

-#define JEMALLOC_MANGLE

 #include <jemalloc/jemalloc.h>
 #include <jemalloc/jemalloc.h>

-#if JEMALLOC_VERSION_MAJOR >= 2 && JEMALLOC_VERSION_MINOR >= 1
+#if (JEMALLOC_VERSION_MAJOR == 2 && JEMALLOC_VERSION_MINOR >= 1) || (JEMALLOC_VERSION_MAJOR > 2)

 #define HAVE_MALLOC_SIZE 1
 #define HAVE_MALLOC_SIZE 1

-#define zmalloc_size(p) JEMALLOC_P(malloc_usable_size)(p)
+#define zmalloc_size(p) je_malloc_usable_size(p)

 #else
 #error "Newer version of jemalloc required"
 #endif
 #else
 #error "Newer version of jemalloc required"
 #endif


@@ -73,7 +72,14 @@ void zfree(void *ptr);
 char *zstrdup(const char *s);
 size_t zmalloc_used_memory(void);
 void zmalloc_enable_thread_safeness(void);
 char *zstrdup(const char *s);
 size_t zmalloc_used_memory(void);
 void zmalloc_enable_thread_safeness(void);

+void zmalloc_set_oom_handler(void (*oom_handler)(size_t));

 float zmalloc_get_fragmentation_ratio(void);
 size_t zmalloc_get_rss(void);
 float zmalloc_get_fragmentation_ratio(void);
 size_t zmalloc_get_rss(void);

+size_t zmalloc_get_private_dirty(void);
+void zlibc_free(void *ptr);
+
+#ifndef HAVE_MALLOC_SIZE
+size_t zmalloc_size(void *ptr);
+#endif

 
 #endif /* __ZMALLOC_H */
 
 #endif /* __ZMALLOC_H */