File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -239,8 +239,7 @@ pub(crate) unsafe fn profiling_experimental_timeline_enabled() -> bool {
239239/// This function must only be called after config has been initialized in
240240/// rinit, and before it is uninitialized in mshutdown.
241241pub ( 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 )
244243}
245244
246245/// # 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) {
863863 if #[ cfg( feature = "exception_profiling" ) ] {
864864 zend:: php_info_print_table_row(
865865 2 ,
866- b"Experimental Exception Profiling Enabled\0 " . as_ptr( ) ,
866+ b"Exception Profiling Enabled\0 " . as_ptr( ) ,
867867 if locals. profiling_exception_enabled {
868- if locals. profiling_experimental_features_enabled {
869- yes_exp
870- } else {
871- yes
872- }
868+ yes
873869 } else if locals. profiling_enabled {
874870 no
875871 } else {
Original file line number Diff line number Diff line change @@ -14,7 +14,7 @@ DD_PROFILING_EXPERIMENTAL_FEATURES_ENABLED=yes
1414DD_PROFILING_LOG_LEVEL=off
1515DD_PROFILING_EXPERIMENTAL_CPU_TIME_ENABLED=no
1616DD_PROFILING_ALLOCATION_ENABLED=no
17- DD_PROFILING_EXPERIMENTAL_EXCEPTION_ENABLED =no
17+ DD_PROFILING_EXCEPTION_ENABLED =no
1818DD_PROFILING_EXPERIMENTAL_TIMELINE_ENABLED=no
1919--INI--
2020assert.exception=1
@@ -46,7 +46,7 @@ $sections = [
4646 ["Profiling Experimental Features Enabled " , "false (profiling disabled) " ],
4747 ["Experimental CPU Time Profiling Enabled " , "false (profiling disabled) " ],
4848 ["Allocation Profiling Enabled " , "false (profiling disabled) " ],
49- ["Experimental Exception Profiling Enabled " , "false (profiling disabled) " ],
49+ ["Exception Profiling Enabled " , "false (profiling disabled) " ],
5050 ["Experimental Timeline Enabled " , "false (profiling disabled) " ],
5151];
5252
Original file line number Diff line number Diff line change @@ -14,7 +14,7 @@ DD_PROFILING_EXPERIMENTAL_FEATURES_ENABLED=yes
1414DD_PROFILING_LOG_LEVEL=off
1515DD_PROFILING_EXPERIMENTAL_CPU_TIME_ENABLED=no
1616DD_PROFILING_ALLOCATION_ENABLED=no
17- DD_PROFILING_EXPERIMENTAL_EXCEPTION_ENABLED =no
17+ DD_PROFILING_EXCEPTION_ENABLED =no
1818DD_PROFILING_EXPERIMENTAL_TIMELINE_ENABLED=no
1919--INI--
2020assert.exception=1
@@ -46,7 +46,7 @@ $sections = [
4646 ["Profiling Experimental Features Enabled " , "true " ],
4747 ["Experimental CPU Time Profiling Enabled " , "true (all experimental features enabled) " ],
4848 ["Allocation Profiling Enabled " , "false " ],
49- ["Experimental Exception Profiling Enabled " , "true (all experimental features enabled) " ],
49+ ["Exception Profiling Enabled " , "false " ],
5050 ["Experimental Timeline Enabled " , "true (all experimental features enabled) " ],
5151];
5252
You can’t perform that action at this time.
0 commit comments