Skip to content

fix(prof): reset interrupt count when removing interrupt #3455

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

Merged
merged 1 commit into from
Oct 21, 2025
+6 −1
Merged

fix(prof): reset interrupt count when removing interrupt #3455

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 0 additions & 1 deletion profiling/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -577,7 +577,6 @@ extern "C" fn rinit(_type: c_int, _module_number: c_int) -> ZendResult {
let result = REQUEST_LOCALS.try_with_borrow_mut(|locals| {
// SAFETY: we are in rinit on a PHP thread.
locals.vm_interrupt_addr = unsafe { zend::datadog_php_profiling_vm_interrupt_addr() };
locals.interrupt_count.store(0, Ordering::SeqCst);

// SAFETY: We are after first rinit and before mshutdown.
unsafe {
Expand Down
6 changes: 6 additions & 0 deletions profiling/src/profiling/interrupts.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,12 @@ impl InterruptManager {
pub(super) fn remove_interrupt(&self, interrupt: VmInterrupt) {
let mut vm_interrupts = self.vm_interrupts.lock().unwrap();
vm_interrupts.remove(&interrupt);
unsafe {
// Reset interrupt counter to prevent sampling during `mshutdown` (PHP 8.0 bug with
// userland destructors), but leave the interrupt flag unchanged as other extensions
// may have raised it.
(*interrupt.interrupt_count_ptr).store(0, Ordering::SeqCst);
}
}

#[inline]
Expand Down
Loading