diff options
| author | Jason Evans <jasone@canonware.com> | 2016-06-08 18:41:24 (GMT) |
|---|---|---|
| committer | Jason Evans <jasone@canonware.com> | 2016-06-08 18:41:24 (GMT) |
| commit | 3de035335255d553bdb344c32ffdb603816195d8 (patch) | |
| tree | 24896f5754301439fbfd4c280c71e46e5c830207 /src/jemalloc.c | |
| parent | f70a254d44c8d30af2cd5d30531fb18fdabaae6d (diff) | |
| parent | 5271b673b2e93dd655fde6f2ee1ea849da5cb3d2 (diff) | |
| download | jemalloc-4.2.1.zip jemalloc-4.2.1.tar.gz jemalloc-4.2.1.tar.bz2 | |
Merge branch.4.2.1
Diffstat (limited to 'src/jemalloc.c')
| -rw-r--r-- | src/jemalloc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/jemalloc.c b/src/jemalloc.c index 40eb2ea..5d1f493 100644 --- a/src/jemalloc.c +++ b/src/jemalloc.c @@ -1739,7 +1739,7 @@ je_calloc(size_t num, size_t size) ret = ialloc_body(num_size, true, &tsdn, &usize, true); ialloc_post_check(ret, tsdn, usize, "calloc", true, true); UTRACE(0, num_size, ret); - JEMALLOC_VALGRIND_MALLOC(ret != NULL, tsdn, ret, usize, false); + JEMALLOC_VALGRIND_MALLOC(ret != NULL, tsdn, ret, usize, true); } return (ret); @@ -2222,7 +2222,7 @@ irallocx_prof(tsd_t *tsd, void *old_ptr, size_t old_usize, size_t size, prof_active = prof_active_get_unlocked(); old_tctx = prof_tctx_get(tsd_tsdn(tsd), old_ptr); - tctx = prof_alloc_prep(tsd, *usize, prof_active, true); + tctx = prof_alloc_prep(tsd, *usize, prof_active, false); if (unlikely((uintptr_t)tctx != (uintptr_t)1U)) { p = irallocx_prof_sample(tsd, old_ptr, old_usize, *usize, alignment, zero, tcache, arena, tctx); @@ -2231,7 +2231,7 @@ irallocx_prof(tsd_t *tsd, void *old_ptr, size_t old_usize, size_t size, tcache, arena); } if (unlikely(p == NULL)) { - prof_alloc_rollback(tsd, tctx, true); + prof_alloc_rollback(tsd, tctx, false); return (NULL); } @@ -2246,7 +2246,7 @@ irallocx_prof(tsd_t *tsd, void *old_ptr, size_t old_usize, size_t size, */ *usize = isalloc(tsd_tsdn(tsd), p, config_prof); } - prof_realloc(tsd, p, *usize, tctx, prof_active, true, old_ptr, + prof_realloc(tsd, p, *usize, tctx, prof_active, false, old_ptr, old_usize, old_tctx); return (p); |