correctly set AOF base size field in server structure

[redis.git] / src / zmalloc.c

diff --git a/src/zmalloc.c b/src/zmalloc.c
index 8658376a3462c9e4278c97eaf914b07dd6deaa8d..aa3ccfe963d8fa6e67eacca70dc2ce953b973c27 100644 (file)
--- a/src/zmalloc.c
+++ b/src/zmalloc.c
@@ -33,26 +33,42 @@
 #include <string.h>
 #include <pthread.h>
 #include "config.h"
 #include <string.h>
 #include <pthread.h>
 #include "config.h"

+#include "zmalloc.h"

 
 

+#ifdef HAVE_MALLOC_SIZE
+#define PREFIX_SIZE (0)
+#else

 #if defined(__sun)
 #if defined(__sun)

-#define PREFIX_SIZE sizeof(long long)
+#define PREFIX_SIZE (sizeof(long long))

 #else
 #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
 
 #endif
 

-#define increment_used_memory(__n) do { \
+#define update_zmalloc_stat_alloc(__n,__size) do { \

     size_t _n = (__n); \
     size_t _n = (__n); \

+    size_t _stat_slot = (__size < ZMALLOC_MAX_ALLOC_STAT) ? __size : ZMALLOC_MAX_ALLOC_STAT; \

     if (_n&(sizeof(long)-1)) _n += sizeof(long)-(_n&(sizeof(long)-1)); \
     if (zmalloc_thread_safe) { \
         pthread_mutex_lock(&used_memory_mutex);  \
         used_memory += _n; \
     if (_n&(sizeof(long)-1)) _n += sizeof(long)-(_n&(sizeof(long)-1)); \
     if (zmalloc_thread_safe) { \
         pthread_mutex_lock(&used_memory_mutex);  \
         used_memory += _n; \

+        zmalloc_allocations[_stat_slot]++; \

         pthread_mutex_unlock(&used_memory_mutex); \
     } else { \
         used_memory += _n; \
         pthread_mutex_unlock(&used_memory_mutex); \
     } else { \
         used_memory += _n; \

+        zmalloc_allocations[_stat_slot]++; \

     } \
 } while(0)
 
     } \
 } while(0)
 

-#define decrement_used_memory(__n) do { \
+#define update_zmalloc_stat_free(__n) do { \

     size_t _n = (__n); \
     if (_n&(sizeof(long)-1)) _n += sizeof(long)-(_n&(sizeof(long)-1)); \
     if (zmalloc_thread_safe) { \
     size_t _n = (__n); \
     if (_n&(sizeof(long)-1)) _n += sizeof(long)-(_n&(sizeof(long)-1)); \
     if (zmalloc_thread_safe) { \


@@ -67,6 +83,8 @@
 static size_t used_memory = 0;
 static int zmalloc_thread_safe = 0;
 pthread_mutex_t used_memory_mutex = PTHREAD_MUTEX_INITIALIZER;
 static size_t used_memory = 0;
 static int zmalloc_thread_safe = 0;
 pthread_mutex_t used_memory_mutex = PTHREAD_MUTEX_INITIALIZER;

+/* Note that malloc_allocations elements are initialized to zero by C */
+size_t zmalloc_allocations[ZMALLOC_MAX_ALLOC_STAT+1];

 
 static void zmalloc_oom(size_t size) {
     fprintf(stderr, "zmalloc: Out of memory trying to allocate %zu bytes\n",
 
 static void zmalloc_oom(size_t size) {
     fprintf(stderr, "zmalloc: Out of memory trying to allocate %zu bytes\n",


@@ -80,11 +98,25 @@ void *zmalloc(size_t size) {
 
     if (!ptr) zmalloc_oom(size);
 #ifdef HAVE_MALLOC_SIZE
 
     if (!ptr) zmalloc_oom(size);
 #ifdef HAVE_MALLOC_SIZE

-    increment_used_memory(redis_malloc_size(ptr));
+    update_zmalloc_stat_alloc(redis_malloc_size(ptr),size);

     return ptr;
 #else
     *((size_t*)ptr) = size;
     return ptr;
 #else
     *((size_t*)ptr) = size;

-    increment_used_memory(size+PREFIX_SIZE);
+    update_zmalloc_stat_alloc(size+PREFIX_SIZE,size);
+    return (char*)ptr+PREFIX_SIZE;
+#endif
+}
+
+void *zcalloc(size_t size) {
+    void *ptr = calloc(1, size+PREFIX_SIZE);
+
+    if (!ptr) zmalloc_oom(size);
+#ifdef HAVE_MALLOC_SIZE
+    update_zmalloc_stat_alloc(redis_malloc_size(ptr),size);
+    return ptr;
+#else
+    *((size_t*)ptr) = size;
+    update_zmalloc_stat_alloc(size+PREFIX_SIZE,size);

     return (char*)ptr+PREFIX_SIZE;
 #endif
 }
     return (char*)ptr+PREFIX_SIZE;
 #endif
 }


@@ -102,8 +134,8 @@ void *zrealloc(void *ptr, size_t size) {
     newptr = realloc(ptr,size);
     if (!newptr) zmalloc_oom(size);
 
     newptr = realloc(ptr,size);
     if (!newptr) zmalloc_oom(size);
 

-    decrement_used_memory(oldsize);
-    increment_used_memory(redis_malloc_size(newptr));
+    update_zmalloc_stat_free(oldsize);
+    update_zmalloc_stat_alloc(redis_malloc_size(newptr),size);

     return newptr;
 #else
     realptr = (char*)ptr-PREFIX_SIZE;
     return newptr;
 #else
     realptr = (char*)ptr-PREFIX_SIZE;


@@ -112,8 +144,8 @@ void *zrealloc(void *ptr, size_t size) {
     if (!newptr) zmalloc_oom(size);
 
     *((size_t*)newptr) = size;
     if (!newptr) zmalloc_oom(size);
 
     *((size_t*)newptr) = size;

-    decrement_used_memory(oldsize);
-    increment_used_memory(size);
+    update_zmalloc_stat_free(oldsize);
+    update_zmalloc_stat_alloc(size,size);

     return (char*)newptr+PREFIX_SIZE;
 #endif
 }
     return (char*)newptr+PREFIX_SIZE;
 #endif
 }


@@ -126,12 +158,12 @@ void zfree(void *ptr) {
 
     if (ptr == NULL) return;
 #ifdef HAVE_MALLOC_SIZE
 
     if (ptr == NULL) return;
 #ifdef HAVE_MALLOC_SIZE

-    decrement_used_memory(redis_malloc_size(ptr));
+    update_zmalloc_stat_free(redis_malloc_size(ptr));

     free(ptr);
 #else
     realptr = (char*)ptr-PREFIX_SIZE;
     oldsize = *((size_t*)realptr);
     free(ptr);
 #else
     realptr = (char*)ptr-PREFIX_SIZE;
     oldsize = *((size_t*)realptr);

-    decrement_used_memory(oldsize+PREFIX_SIZE);
+    update_zmalloc_stat_free(oldsize+PREFIX_SIZE);

     free(realptr);
 #endif
 }
     free(realptr);
 #endif
 }


@@ -153,6 +185,94 @@ size_t zmalloc_used_memory(void) {
     return um;
 }
 
     return um;
 }
 

+size_t zmalloc_allocations_for_size(size_t size) {
+    if (size > ZMALLOC_MAX_ALLOC_STAT) return 0;
+    return zmalloc_allocations[size];
+}
+

 void zmalloc_enable_thread_safeness(void) {
     zmalloc_thread_safe = 1;
 }
 void zmalloc_enable_thread_safeness(void) {
     zmalloc_thread_safe = 1;
 }

+
+/* Get the RSS information in an OS-specific way.
+ *
+ * WARNING: the function zmalloc_get_rss() is not designed to be fast
+ * and may not be called in the busy loops where Redis tries to release
+ * memory expiring or swapping out objects.
+ *
+ * For this kind of "fast RSS reporting" usages use instead the
+ * function RedisEstimateRSS() that is a much faster (and less precise)
+ * version of the funciton. */
+
+#if defined(HAVE_PROCFS)
+#include <unistd.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+
+size_t zmalloc_get_rss(void) {
+    int page = sysconf(_SC_PAGESIZE);
+    size_t rss;
+    char buf[4096];
+    char filename[256];
+    int fd, count;
+    char *p, *x;
+
+    snprintf(filename,256,"/proc/%d/stat",getpid());
+    if ((fd = open(filename,O_RDONLY)) == -1) return 0;
+    if (read(fd,buf,4096) <= 0) {
+        close(fd);
+        return 0;
+    }
+    close(fd);
+
+    p = buf;
+    count = 23; /* RSS is the 24th field in /proc/<pid>/stat */
+    while(p && count--) {
+        p = strchr(p,' ');
+        if (p) p++;
+    }
+    if (!p) return 0;
+    x = strchr(p,' ');
+    if (!x) return 0;
+    *x = '\0';
+
+    rss = strtoll(p,NULL,10);
+    rss *= page;
+    return rss;
+}
+#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>
+
+size_t zmalloc_get_rss(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 t_info.resident_size;
+}
+#else
+size_t zmalloc_get_rss(void) {
+    /* If we can't get the RSS in an OS-specific way for this system just
+     * return the memory usage we estimated in zmalloc()..
+     *
+     * Fragmentation will appear to be always 1 (no fragmentation)
+     * of course... */
+    return zmalloc_used_memory();
+}
+#endif
+
+/* Fragmentation = RSS / allocated-bytes */
+float zmalloc_get_fragmentation_ratio(void) {
+    return (float)zmalloc_get_rss()/zmalloc_used_memory();
+}