Skip to content

Commit 9ac8a33

Browse files
committed
Revert "perf(profiling): skip idle internal interrupt handling"
This reverts commit 02acd65.
1 parent 9cefb02 commit 9ac8a33

3 files changed

Lines changed: 2 additions & 13 deletions

File tree

profiling/src/php_ffi.c

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -248,14 +248,6 @@ zend_execute_data* ddog_php_prof_get_current_execute_data() {
248248
return EG(current_execute_data);
249249
}
250250

251-
bool ddog_php_prof_vm_interrupt_pending() {
252-
#if PHP_VERSION_ID >= 80000
253-
return zend_atomic_bool_load_ex(&EG(vm_interrupt));
254-
#else
255-
return EG(vm_interrupt);
256-
#endif
257-
}
258-
259251
#if CFG_FIBERS // defined by build.rs
260252
zend_fiber* ddog_php_prof_get_active_fiber()
261253
{

profiling/src/php_ffi.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,6 @@ void ddog_php_prof_zend_mm_set_custom_handlers(zend_mm_heap *heap,
162162
ddog_php_prof_zend_mm_realloc _realloc);
163163

164164
zend_execute_data* ddog_php_prof_get_current_execute_data();
165-
bool ddog_php_prof_vm_interrupt_pending();
166165

167166
#if CFG_FRAMELESS
168167
void ddog_php_prof_post_startup();

profiling/src/wall_time.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,10 +79,8 @@ mod execute_internal {
7979
unsafe { prev_execute_internal(execute_data, return_value) };
8080

8181
// See safety section of `execute_data_func_is_trampoline` docs for why
82-
// the leaf frame is used instead of the execute_data ptr.
83-
if unsafe { zend::ddog_php_prof_vm_interrupt_pending() } {
84-
ddog_php_prof_interrupt_function(leaf_frame);
85-
}
82+
// the leaf frame is used instead of the execute_data ptr.
83+
ddog_php_prof_interrupt_function(leaf_frame);
8684
}
8785

8886
/// # Safety

0 commit comments

Comments
 (0)