#include <stdlib.h>
#include <string.h>
#include <pthread.h>
-
#include "config.h"
+#include "zmalloc.h"
-#if defined(__sun)
-#define PREFIX_SIZE sizeof(long long)
+#ifdef HAVE_MALLOC_SIZE
+#define PREFIX_SIZE (0)
+#else
+#if defined(__sun) || defined(__sparc) || defined(__sparc__)
+#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)
+#elif defined(USE_JEMALLOC)
+#define malloc(size) je_malloc(size)
+#define calloc(count,size) je_calloc(count,size)
+#define realloc(ptr,size) je_realloc(ptr,size)
+#define free(ptr) je_free(ptr)
#endif
-#define increment_used_memory(__n) do { \
+#define update_zmalloc_stat_alloc(__n,__size) do { \
size_t _n = (__n); \
if (_n&(sizeof(long)-1)) _n += sizeof(long)-(_n&(sizeof(long)-1)); \
if (zmalloc_thread_safe) { \
} \
} 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) { \
if (!ptr) zmalloc_oom(size);
#ifdef HAVE_MALLOC_SIZE
- increment_used_memory(redis_malloc_size(ptr));
+ update_zmalloc_stat_alloc(zmalloc_size(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
}
if (!ptr) zmalloc_oom(size);
#ifdef HAVE_MALLOC_SIZE
- increment_used_memory(redis_malloc_size(ptr));
+ update_zmalloc_stat_alloc(zmalloc_size(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
}
if (ptr == NULL) return zmalloc(size);
#ifdef HAVE_MALLOC_SIZE
- oldsize = redis_malloc_size(ptr);
+ oldsize = zmalloc_size(ptr);
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(zmalloc_size(newptr),size);
return newptr;
#else
realptr = (char*)ptr-PREFIX_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
}
+/* Provide zmalloc_size() for systems where this function is not provided by
+ * malloc itself, given that in that case we store an header with this
+ * information as the first bytes of every allocation. */
+#ifndef HAVE_MALLOC_SIZE
+size_t zmalloc_size(void *ptr) {
+ void *realptr = (char*)ptr-PREFIX_SIZE;
+ size_t size = *((size_t*)realptr);
+ /* Assume at least that all the allocations are padded at sizeof(long) by
+ * the underlying allocator. */
+ if (size&(sizeof(long)-1)) size += sizeof(long)-(size&(sizeof(long)-1));
+ return size+PREFIX_SIZE;
+}
+#endif
+
void zfree(void *ptr) {
#ifndef HAVE_MALLOC_SIZE
void *realptr;
if (ptr == NULL) return;
#ifdef HAVE_MALLOC_SIZE
- decrement_used_memory(redis_malloc_size(ptr));
+ update_zmalloc_stat_free(zmalloc_size(ptr));
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
}
zmalloc_thread_safe = 1;
}
-/* Fragmentation = RSS / allocated-bytes */
+/* 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/stat.h>
#include <fcntl.h>
-float zmalloc_get_fragmentation_ratio(void) {
- size_t allocated = zmalloc_used_memory();
+size_t zmalloc_get_rss(void) {
int page = sysconf(_SC_PAGESIZE);
size_t rss;
char buf[4096];
rss = strtoll(p,NULL,10);
rss *= page;
- return (float)rss/allocated;
+ return rss;
}
#elif defined(HAVE_TASKINFO)
#include <unistd.h>
#include <mach/task.h>
#include <mach/mach_init.h>
-float zmalloc_get_fragmentation_ratio(void) {
+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;
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();
+ return t_info.resident_size;
}
#else
-float zmalloc_get_fragmentation_ratio(void) {
- return 0;
+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();
+}
projects / redis.git / blobdiff