merge conflict resolved

[redis.git] / src / zmalloc.c

diff --git a/src/zmalloc.c b/src/zmalloc.c
index 81fc4c044a68ba4ef425e4fa24703ff8ed20991b..8cfb18d940f23b105439bd090d61fa87e4be3987 100644 (file)
--- a/src/zmalloc.c
+++ b/src/zmalloc.c
@@ -32,16 +32,24 @@
 #include <stdlib.h>
 #include <string.h>
 #include <pthread.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
 #include "config.h"
 
+#ifdef HAVE_MALLOC_SIZE
+#define PREFIX_SIZE (0)
+#else
 #if defined(__sun)
-#define PREFIX_SIZE sizeof(long long)
+#define PREFIX_SIZE (sizeof(long long))
 #else
-#define PREFIX_SIZE sizeof(size_t)
+#define PREFIX_SIZE (sizeof(size_t))
+#endif
+#endif
+
+/* Explicitly override malloc/free etc when using tcmalloc. */
+#if defined(USE_TCMALLOC)
+#define malloc(size) tc_malloc(size)
+#define calloc(count,size) tc_calloc(count,size)
+#define realloc(ptr,size) tc_realloc(ptr,size)
+#define free(ptr) tc_free(ptr)
 #endif
 
 #define increment_used_memory(__n) do { \
@@ -176,8 +184,14 @@ void zmalloc_enable_thread_safeness(void) {
 }
 
 /* Fragmentation = RSS / allocated-bytes */
+
+#if defined(HAVE_PROCFS)
+#include <unistd.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+
 float zmalloc_get_fragmentation_ratio(void) {
-#ifdef HAVE_PROCFS
     size_t allocated = zmalloc_used_memory();
     int page = sysconf(_SC_PAGESIZE);
     size_t rss;
@@ -208,7 +222,29 @@ float zmalloc_get_fragmentation_ratio(void) {
     rss = strtoll(p,NULL,10);
     rss *= page;
     return (float)rss/allocated;
+}
+#elif defined(HAVE_TASKINFO)
+#include <unistd.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <sys/types.h>
+#include <sys/sysctl.h>
+#include <mach/task.h>
+#include <mach/mach_init.h>
+
+float zmalloc_get_fragmentation_ratio(void) {
+    task_t task = MACH_PORT_NULL;
+    struct task_basic_info t_info;
+    mach_msg_type_number_t t_info_count = TASK_BASIC_INFO_COUNT;
+
+    if (task_for_pid(current_task(), getpid(), &task) != KERN_SUCCESS)
+        return 0;
+    task_info(task, TASK_BASIC_INFO, (task_info_t)&t_info, &t_info_count);
+
+    return (float)t_info.resident_size/zmalloc_used_memory();
+}
 #else
+float zmalloc_get_fragmentation_ratio(void) {
     return 0;
-#endif
 }
+#endif