diff options
| author | Jason Evans <jasone@canonware.com> | 2010-04-14 22:07:37 (GMT) |
|---|---|---|
| committer | Jason Evans <jasone@canonware.com> | 2010-04-14 22:07:37 (GMT) |
| commit | 1af6ac42e303f229d5e8bb38252b1fb7371081b2 (patch) | |
| tree | 0199eb3067af365c1c5268a49cf4b76d7efd2e15 /jemalloc/src/jemalloc.c | |
| parent | 552339916925c5432e51ab78864fe63edba9298d (diff) | |
| parent | 5055f4516c8852e67668b0e746863a7d6a1c148e (diff) | |
| download | jemalloc-1.0.1.zip jemalloc-1.0.1.tar.gz jemalloc-1.0.1.tar.bz2 | |
Merge branch 'dev'1.0.1
Diffstat (limited to 'jemalloc/src/jemalloc.c')
| -rw-r--r-- | jemalloc/src/jemalloc.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/jemalloc/src/jemalloc.c b/jemalloc/src/jemalloc.c index e01de0d..aeab140 100644 --- a/jemalloc/src/jemalloc.c +++ b/jemalloc/src/jemalloc.c @@ -1060,7 +1060,8 @@ JEMALLOC_P(realloc)(void *ptr, size_t size) void *ret; #ifdef JEMALLOC_PROF size_t old_size; - prof_thr_cnt_t *cnt, *old_cnt; + prof_thr_cnt_t *cnt; + prof_ctx_t *old_ctx; #endif if (size == 0) { @@ -1074,7 +1075,7 @@ JEMALLOC_P(realloc)(void *ptr, size_t size) #ifdef JEMALLOC_PROF if (opt_prof) { old_size = isalloc(ptr); - old_cnt = prof_cnt_get(ptr); + old_ctx = prof_ctx_get(ptr); cnt = NULL; } #endif @@ -1083,7 +1084,7 @@ JEMALLOC_P(realloc)(void *ptr, size_t size) #ifdef JEMALLOC_PROF else if (opt_prof) { old_size = 0; - old_cnt = NULL; + old_ctx = NULL; cnt = NULL; } #endif @@ -1100,7 +1101,7 @@ JEMALLOC_P(realloc)(void *ptr, size_t size) #ifdef JEMALLOC_PROF if (opt_prof) { old_size = isalloc(ptr); - old_cnt = prof_cnt_get(ptr); + old_ctx = prof_ctx_get(ptr); if ((cnt = prof_alloc_prep(size)) == NULL) { ret = NULL; goto OOM; @@ -1133,7 +1134,7 @@ OOM: #ifdef JEMALLOC_PROF if (opt_prof) { old_size = 0; - old_cnt = NULL; + old_ctx = NULL; } #endif if (malloc_init()) { @@ -1181,7 +1182,7 @@ RETURN: #endif #ifdef JEMALLOC_PROF if (opt_prof) - prof_realloc(ret, cnt, ptr, old_size, old_cnt); + prof_realloc(ret, cnt, ptr, old_size, old_ctx); #endif return (ret); } |