Skip to content

Commit 9cb1c50

Browse files
committed
reorder runtime subsystems deinitializations
1 parent a3420db commit 9cb1c50

1 file changed

Lines changed: 6 additions & 5 deletions

File tree

runtime/interface.cpp

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2417,6 +2417,9 @@ static void free_interface_lib() {
24172417
static void free_runtime_libs() {
24182418
php_assert(dl::in_critical_section == 0);
24192419

2420+
OnKphpWarningCallback::get().reset();
2421+
vk::singleton<OomHandler>::get().reset();
2422+
24202423
free_interface_lib();
24212424
forcibly_stop_and_flush_profiler();
24222425
free_bcmath_lib();
@@ -2432,16 +2435,12 @@ static void free_runtime_libs() {
24322435
free_udp_lib();
24332436
free_tcp_lib();
24342437
free_timelib();
2435-
OnKphpWarningCallback::get().reset();
24362438
kphp_tracing::free_tracing_lib();
24372439
free_slot_factories();
24382440
runtime_builtins_stats::reset_request_stats();
24392441

24402442
free_job_client_interface_lib();
24412443
free_job_server_interface_lib();
2442-
2443-
free_confdata_functions_lib();
2444-
free_instance_cache_lib();
24452444
free_kphp_backtrace();
24462445

24472446
free_use_updated_gmmktime();
@@ -2455,8 +2454,10 @@ static void free_runtime_libs() {
24552454
#endif
24562455
vk::singleton<database_drivers::Adaptor>::get().reset();
24572456
vk::singleton<curl_async::CurlAdaptor>::get().reset();
2458-
vk::singleton<OomHandler>::get().reset();
24592457
hard_reset_var(SerializationLibContext::get().last_json_processor_error);
2458+
2459+
free_confdata_functions_lib();
2460+
free_instance_cache_lib();
24602461
}
24612462

24622463
void global_init_runtime_libs() {

0 commit comments

Comments
 (0)