Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ruanhaishen
redis
Commits
29d04257
Commit
29d04257
authored
Jun 20, 2011
by
antirez
Browse files
forward-ported changes in zmalloc.c/h to support jemalloc build
parent
a78e148b
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/zmalloc.c
View file @
29d04257
...
...
@@ -51,6 +51,11 @@
#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 update_zmalloc_stat_alloc(__n,__size) do { \
...
...
@@ -98,7 +103,7 @@ void *zmalloc(size_t size) {
if
(
!
ptr
)
zmalloc_oom
(
size
);
#ifdef HAVE_MALLOC_SIZE
update_zmalloc_stat_alloc
(
redis_
malloc_size
(
ptr
),
size
);
update_zmalloc_stat_alloc
(
z
malloc_size
(
ptr
),
size
);
return
ptr
;
#else
*
((
size_t
*
)
ptr
)
=
size
;
...
...
@@ -112,7 +117,7 @@ void *zcalloc(size_t size) {
if
(
!
ptr
)
zmalloc_oom
(
size
);
#ifdef HAVE_MALLOC_SIZE
update_zmalloc_stat_alloc
(
redis_
malloc_size
(
ptr
),
size
);
update_zmalloc_stat_alloc
(
z
malloc_size
(
ptr
),
size
);
return
ptr
;
#else
*
((
size_t
*
)
ptr
)
=
size
;
...
...
@@ -130,12 +135,12 @@ void *zrealloc(void *ptr, size_t size) {
if
(
ptr
==
NULL
)
return
zmalloc
(
size
);
#ifdef HAVE_MALLOC_SIZE
oldsize
=
redis_
malloc_size
(
ptr
);
oldsize
=
z
malloc_size
(
ptr
);
newptr
=
realloc
(
ptr
,
size
);
if
(
!
newptr
)
zmalloc_oom
(
size
);
update_zmalloc_stat_free
(
oldsize
);
update_zmalloc_stat_alloc
(
redis_
malloc_size
(
newptr
),
size
);
update_zmalloc_stat_alloc
(
z
malloc_size
(
newptr
),
size
);
return
newptr
;
#else
realptr
=
(
char
*
)
ptr
-
PREFIX_SIZE
;
...
...
@@ -158,7 +163,7 @@ void zfree(void *ptr) {
if
(
ptr
==
NULL
)
return
;
#ifdef HAVE_MALLOC_SIZE
update_zmalloc_stat_free
(
redis_
malloc_size
(
ptr
));
update_zmalloc_stat_free
(
z
malloc_size
(
ptr
));
free
(
ptr
);
#else
realptr
=
(
char
*
)
ptr
-
PREFIX_SIZE
;
...
...
src/zmalloc.h
View file @
29d04257
...
...
@@ -28,8 +28,43 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef _ZMALLOC_H
#define _ZMALLOC_H
#ifndef __ZMALLOC_H
#define __ZMALLOC_H
/* Double expansion needed for stringification of macro values. */
#define __xstr(s) __str(s)
#define __str(s) #s
#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
#define HAVE_MALLOC_SIZE 1
#define zmalloc_size(p) tc_malloc_size(p)
#else
#error "Newer version of tcmalloc required"
#endif
#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>
#if JEMALLOC_VERSION_MAJOR >= 2 && JEMALLOC_VERSION_MINOR >= 1
#define HAVE_MALLOC_SIZE 1
#define zmalloc_size(p) JEMALLOC_P(malloc_usable_size)(p)
#else
#error "Newer version of jemalloc required"
#endif
#elif defined(__APPLE__)
#include <malloc/malloc.h>
#define HAVE_MALLOC_SIZE 1
#define zmalloc_size(p) malloc_size(p)
#endif
#ifndef ZMALLOC_LIB
#define ZMALLOC_LIB "libc"
#endif
void
*
zmalloc
(
size_t
size
);
void
*
zcalloc
(
size_t
size
);
...
...
@@ -44,4 +79,4 @@ size_t zmalloc_allocations_for_size(size_t size);
#define ZMALLOC_MAX_ALLOC_STAT 256
#endif
/* _ZMALLOC_H */
#endif
/*
_
_ZMALLOC_H */
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment