romenskiy2012/jemalloc
1
0
Fork 0
mirror of https://github.com/jemalloc/jemalloc.git synced 2026-04-14 22:51:50 +03:00
Code Issues Projects Releases Packages Wiki Activity

Fix profiling sample metadata lookup during xallocx

Browse source
This commit is contained in:
Guangli Dai 2025-03-03 10:17:03 -08:00 • committed by Qi Wang
parent f55e0c3f5c
commit ac279d7e71
2 changed files with 37 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/jemalloc.c
View file

@ -3708,7 +3708,15 @@ ixallocx_prof(tsd_t *tsd, void *ptr, size_t old_usize, size_t size,
prof_info_get(tsd, ptr, alloc_ctx, &prof_info);
prof_alloc_rollback(tsd, tctx);
} else {
prof_info_get_and_reset_recent(tsd, ptr, alloc_ctx, &prof_info);
/*
* Need to retrieve the new alloc_ctx since the modification
* to edata has already been done.
*/
emap_alloc_ctx_t new_alloc_ctx;
emap_alloc_ctx_lookup(tsd_tsdn(tsd), &arena_emap_global, ptr,
&new_alloc_ctx);
prof_info_get_and_reset_recent(tsd, ptr, &new_alloc_ctx,
&prof_info);
assert(usize <= usize_max);
sample_event = te_prof_sample_event_lookahead(tsd, usize);
prof_realloc(tsd, ptr, size, usize, tctx, prof_active, ptr,

29
test/unit/prof_small.c
View file

@ -31,13 +31,39 @@ TEST_BEGIN(test_profile_small_allocations) {
}
TEST_END
TEST_BEGIN(test_profile_small_allocations_sdallocx) {
test_skip_if(!config_prof);
for (szind_t index = 0; index < SC_NBINS; index++) {
size_t size = sz_index2size(index);
void *ptr = malloc(size);
assert_small_allocation_sampled(ptr, size);
/*
* While free calls into ifree, sdallocx calls into isfree,
* This test covers the isfree path to make sure promoted small
* allocs are handled properly.
*/
sdallocx(ptr, size, 0);
}
}
TEST_END
TEST_BEGIN(test_profile_small_reallocations_growing) {
test_skip_if(!config_prof);
void *ptr = NULL;
for (szind_t index = 0; index < SC_NBINS; index++) {
for (szind_t index = 0; index <= SC_NBINS; index++) {
size_t size = sz_index2size(index);
ptr = realloc(ptr, size);
/*
* When index reaches SC_NBINS, it is no longer a small alloc,
* we still want to test the realloc from a small alloc to a
* large one, but we should not assert_small_allocation_sampled
* on it.
*/
if (index == SC_NBINS) {
break;
}
assert_small_allocation_sampled(ptr, size);
}
}
@ -72,6 +98,7 @@ TEST_END
int
main(void) {
return test(test_profile_small_allocations,
test_profile_small_allocations_sdallocx,
test_profile_small_reallocations_growing,
test_profile_small_reallocations_shrinking,
test_profile_small_reallocations_same_size_class);