commented the HAVE_EPOLL test in config.h to allow compilation under Linux now that...

[redis.git] / zmalloc.c

diff --git a/zmalloc.c b/zmalloc.c
index 54d4bf3ad4ee03405e55d2096b12d74cd725b82e..eb06da3b8925ab52e1c1d981c8ab2106e695433c 100644 (file)
--- a/zmalloc.c
+++ b/zmalloc.c
@@ -33,17 +33,23 @@
 #include <string.h>
 #include "config.h"
 
+#if defined(__sun)
+#define PREFIX_SIZE sizeof(long long)
+#else
+#define PREFIX_SIZE sizeof(size_t)
+#endif
+
 static size_t used_memory = 0;
 
 static void zmalloc_oom(size_t size) {
-    fprintf(stderr, "zmalloc: Out of memory trying to allocate %lu bytes\n",
+    fprintf(stderr, "zmalloc: Out of memory trying to allocate %zu bytes\n",
         size);
     fflush(stderr);
     abort();
 }
 
 void *zmalloc(size_t size) {
-    void *ptr = malloc(size+sizeof(size_t));
+    void *ptr = malloc(size+PREFIX_SIZE);
 
     if (!ptr) zmalloc_oom(size);
 #ifdef HAVE_MALLOC_SIZE
@@ -51,8 +57,8 @@ void *zmalloc(size_t size) {
     return ptr;
 #else
     *((size_t*)ptr) = size;
-    used_memory += size+sizeof(size_t);
-    return (char*)ptr+sizeof(size_t);
+    used_memory += size+PREFIX_SIZE;
+    return (char*)ptr+PREFIX_SIZE;
 #endif
 }
 
@@ -73,15 +79,15 @@ void *zrealloc(void *ptr, size_t size) {
     used_memory += redis_malloc_size(newptr);
     return newptr;
 #else
-    realptr = (char*)ptr-sizeof(size_t);
+    realptr = (char*)ptr-PREFIX_SIZE;
     oldsize = *((size_t*)realptr);
-    newptr = realloc(realptr,size+sizeof(size_t));
+    newptr = realloc(realptr,size+PREFIX_SIZE);
     if (!newptr) zmalloc_oom(size);
 
     *((size_t*)newptr) = size;
     used_memory -= oldsize;
     used_memory += size;
-    return (char*)newptr+sizeof(size_t);
+    return (char*)newptr+PREFIX_SIZE;
 #endif
 }
 
@@ -96,9 +102,9 @@ void zfree(void *ptr) {
     used_memory -= redis_malloc_size(ptr);
     free(ptr);
 #else
-    realptr = (char*)ptr-sizeof(size_t);
+    realptr = (char*)ptr-PREFIX_SIZE;
     oldsize = *((size_t*)realptr);
-    used_memory -= oldsize+sizeof(size_t);
+    used_memory -= oldsize+PREFIX_SIZE;
     free(realptr);
 #endif
 }