File tree Expand file tree Collapse file tree 4 files changed +7
-12
lines changed Expand file tree Collapse file tree 4 files changed +7
-12
lines changed Original file line number Diff line number Diff line change @@ -239,8 +239,7 @@ pub(crate) unsafe fn profiling_experimental_timeline_enabled() -> bool {
239
239
/// This function must only be called after config has been initialized in
240
240
/// rinit, and before it is uninitialized in mshutdown.
241
241
pub ( crate ) unsafe fn profiling_exception_enabled ( ) -> bool {
242
- profiling_experimental_features_enabled ( )
243
- || profiling_enabled ( ) && get_bool ( ProfilingExceptionEnabled , true )
242
+ profiling_enabled ( ) && get_bool ( ProfilingExceptionEnabled , true )
244
243
}
245
244
246
245
/// # Safety
Original file line number Diff line number Diff line change @@ -863,13 +863,9 @@ unsafe extern "C" fn minfo(module_ptr: *mut zend::ModuleEntry) {
863
863
if #[ cfg( feature = "exception_profiling" ) ] {
864
864
zend:: php_info_print_table_row(
865
865
2 ,
866
- b"Experimental Exception Profiling Enabled\0 " . as_ptr( ) ,
866
+ b"Exception Profiling Enabled\0 " . as_ptr( ) ,
867
867
if locals. profiling_exception_enabled {
868
- if locals. profiling_experimental_features_enabled {
869
- yes_exp
870
- } else {
871
- yes
872
- }
868
+ yes
873
869
} else if locals. profiling_enabled {
874
870
no
875
871
} else {
Original file line number Diff line number Diff line change @@ -14,7 +14,7 @@ DD_PROFILING_EXPERIMENTAL_FEATURES_ENABLED=yes
14
14
DD_PROFILING_LOG_LEVEL=off
15
15
DD_PROFILING_EXPERIMENTAL_CPU_TIME_ENABLED=no
16
16
DD_PROFILING_ALLOCATION_ENABLED=no
17
- DD_PROFILING_EXPERIMENTAL_EXCEPTION_ENABLED =no
17
+ DD_PROFILING_EXCEPTION_ENABLED =no
18
18
DD_PROFILING_EXPERIMENTAL_TIMELINE_ENABLED=no
19
19
--INI--
20
20
assert.exception=1
@@ -46,7 +46,7 @@ $sections = [
46
46
["Profiling Experimental Features Enabled " , "false (profiling disabled) " ],
47
47
["Experimental CPU Time Profiling Enabled " , "false (profiling disabled) " ],
48
48
["Allocation Profiling Enabled " , "false (profiling disabled) " ],
49
- ["Experimental Exception Profiling Enabled " , "false (profiling disabled) " ],
49
+ ["Exception Profiling Enabled " , "false (profiling disabled) " ],
50
50
["Experimental Timeline Enabled " , "false (profiling disabled) " ],
51
51
];
52
52
Original file line number Diff line number Diff line change @@ -14,7 +14,7 @@ DD_PROFILING_EXPERIMENTAL_FEATURES_ENABLED=yes
14
14
DD_PROFILING_LOG_LEVEL=off
15
15
DD_PROFILING_EXPERIMENTAL_CPU_TIME_ENABLED=no
16
16
DD_PROFILING_ALLOCATION_ENABLED=no
17
- DD_PROFILING_EXPERIMENTAL_EXCEPTION_ENABLED =no
17
+ DD_PROFILING_EXCEPTION_ENABLED =no
18
18
DD_PROFILING_EXPERIMENTAL_TIMELINE_ENABLED=no
19
19
--INI--
20
20
assert.exception=1
@@ -46,7 +46,7 @@ $sections = [
46
46
["Profiling Experimental Features Enabled " , "true " ],
47
47
["Experimental CPU Time Profiling Enabled " , "true (all experimental features enabled) " ],
48
48
["Allocation Profiling Enabled " , "false " ],
49
- ["Experimental Exception Profiling Enabled " , "true (all experimental features enabled) " ],
49
+ ["Exception Profiling Enabled " , "false " ],
50
50
["Experimental Timeline Enabled " , "true (all experimental features enabled) " ],
51
51
];
52
52
You can’t perform that action at this time.
0 commit comments