Skip to content

fix(prof): use cached heap in alloc_prof_orig_* functions #3547

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
realFlowControl wants to merge 3 commits into
base: master
Choose a base branch
from
+9 −3
Open

fix(prof): use cached heap in alloc_prof_orig_* functions #3547

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f2ddfd3
fix(profiling): use cached heap in alloc_prof_orig_* functions
realFlowControl Dec 23, 2025
bbcaf45
Merge branch 'master' into florian/fix-allocs
realFlowControl Jan 14, 2026
bc7022e
Merge branch 'master' into florian/fix-allocs
realFlowControl Jan 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions profiling/src/allocation/allocation_le83.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -373,7 +373,9 @@ unsafe fn alloc_prof_prev_alloc(len: size_t) -> *mut c_void {
}

unsafe fn alloc_prof_orig_alloc(len: size_t) -> *mut c_void {
let heap = zend::zend_mm_get_heap();
// Safety: `ZEND_MM_STATE.heap` will be initialised in `alloc_prof_rinit()` and custom ZendMM
// handlers are only installed and pointing to this function if initialization was succesful.
let heap = tls_zend_mm_state_get!(heap).unwrap_unchecked();
let (prepare, restore) = tls_zend_mm_state_get!(prepare_restore_zend_heap);
let custom_heap = prepare(heap);
let ptr: *mut c_void = zend::_zend_mm_alloc(heap, len);
Expand All @@ -398,7 +400,9 @@ unsafe fn alloc_prof_prev_free(ptr: *mut c_void) {
}

unsafe fn alloc_prof_orig_free(ptr: *mut c_void) {
let heap = zend::zend_mm_get_heap();
// Safety: `ZEND_MM_STATE.heap` will be initialised in `alloc_prof_rinit()` and custom ZendMM
// handlers are only installed and pointing to this function if initialization was succesful.
let heap = tls_zend_mm_state_get!(heap).unwrap_unchecked();
zend::_zend_mm_free(heap, ptr);
}

Expand Down Expand Up @@ -432,7 +436,9 @@ unsafe fn alloc_prof_prev_realloc(prev_ptr: *mut c_void, len: size_t) -> *mut c_
}

unsafe fn alloc_prof_orig_realloc(prev_ptr: *mut c_void, len: size_t) -> *mut c_void {
let heap = zend::zend_mm_get_heap();
// Safety: `ZEND_MM_STATE.heap` will be initialised in `alloc_prof_rinit()` and custom ZendMM
// handlers are only installed and pointing to this function if initialization was succesful.
let heap = tls_zend_mm_state_get!(heap).unwrap_unchecked();
let (prepare, restore) = tls_zend_mm_state_get!(prepare_restore_zend_heap);
let custom_heap = prepare(heap);
let ptr: *mut c_void = zend::_zend_mm_realloc(heap, prev_ptr, len);
Expand Down
Loading