Fix ixallocx_prof_sample().
Fix ixallocx_prof_sample() to never modify nor create sampled small allocations. xallocx() is in general incapable of moving small allocations, so this fix removes buggy code without loss of generality.
This commit is contained in:
parent
9898051fd1
commit
38e2c8fa9c
@ -4,6 +4,13 @@ brevity. Much more detail can be found in the git revision history:
|
|||||||
|
|
||||||
https://github.com/jemalloc/jemalloc
|
https://github.com/jemalloc/jemalloc
|
||||||
|
|
||||||
|
* 4.0.2 (XXX)
|
||||||
|
|
||||||
|
Bug fixes:
|
||||||
|
- Fix ixallocx_prof_sample() to never modify nor create sampled small
|
||||||
|
allocations. xallocx() is in general incapable of moving small allocations,
|
||||||
|
so this fix removes buggy code without loss of generality.
|
||||||
|
|
||||||
* 4.0.1 (September 15, 2015)
|
* 4.0.1 (September 15, 2015)
|
||||||
|
|
||||||
This is a bugfix release that is somewhat high risk due to the amount of
|
This is a bugfix release that is somewhat high risk due to the amount of
|
||||||
|
@ -2251,26 +2251,13 @@ ixallocx_helper(void *ptr, size_t old_usize, size_t size, size_t extra,
|
|||||||
|
|
||||||
static size_t
|
static size_t
|
||||||
ixallocx_prof_sample(void *ptr, size_t old_usize, size_t size, size_t extra,
|
ixallocx_prof_sample(void *ptr, size_t old_usize, size_t size, size_t extra,
|
||||||
size_t alignment, size_t usize_max, bool zero, prof_tctx_t *tctx)
|
size_t alignment, bool zero, prof_tctx_t *tctx)
|
||||||
{
|
{
|
||||||
size_t usize;
|
size_t usize;
|
||||||
|
|
||||||
if (tctx == NULL)
|
if (tctx == NULL)
|
||||||
return (old_usize);
|
return (old_usize);
|
||||||
/* Use minimum usize to determine whether promotion may happen. */
|
usize = ixallocx_helper(ptr, old_usize, size, extra, alignment, zero);
|
||||||
if (((alignment == 0) ? s2u(size) : sa2u(size, alignment)) <=
|
|
||||||
SMALL_MAXCLASS) {
|
|
||||||
if (ixalloc(ptr, old_usize, SMALL_MAXCLASS+1,
|
|
||||||
(SMALL_MAXCLASS+1 >= size+extra) ? 0 : size+extra -
|
|
||||||
(SMALL_MAXCLASS+1), alignment, zero))
|
|
||||||
return (old_usize);
|
|
||||||
usize = isalloc(ptr, config_prof);
|
|
||||||
if (usize_max < LARGE_MINCLASS)
|
|
||||||
arena_prof_promoted(ptr, usize);
|
|
||||||
} else {
|
|
||||||
usize = ixallocx_helper(ptr, old_usize, size, extra, alignment,
|
|
||||||
zero);
|
|
||||||
}
|
|
||||||
|
|
||||||
return (usize);
|
return (usize);
|
||||||
}
|
}
|
||||||
@ -2296,12 +2283,12 @@ ixallocx_prof(tsd_t *tsd, void *ptr, size_t old_usize, size_t size,
|
|||||||
tctx = prof_alloc_prep(tsd, usize_max, prof_active, false);
|
tctx = prof_alloc_prep(tsd, usize_max, prof_active, false);
|
||||||
if (unlikely((uintptr_t)tctx != (uintptr_t)1U)) {
|
if (unlikely((uintptr_t)tctx != (uintptr_t)1U)) {
|
||||||
usize = ixallocx_prof_sample(ptr, old_usize, size, extra,
|
usize = ixallocx_prof_sample(ptr, old_usize, size, extra,
|
||||||
alignment, usize_max, zero, tctx);
|
alignment, zero, tctx);
|
||||||
} else {
|
} else {
|
||||||
usize = ixallocx_helper(ptr, old_usize, size, extra, alignment,
|
usize = ixallocx_helper(ptr, old_usize, size, extra, alignment,
|
||||||
zero);
|
zero);
|
||||||
}
|
}
|
||||||
if (unlikely(usize == old_usize)) {
|
if (usize == old_usize) {
|
||||||
prof_alloc_rollback(tsd, tctx, false);
|
prof_alloc_rollback(tsd, tctx, false);
|
||||||
return (usize);
|
return (usize);
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user