From 12480457e21ff7030907732a9e3a2f4913871d0e Mon Sep 17 00:00:00 2001 From: Ole Schmidt Date: Wed, 17 Apr 2024 12:56:07 +0200 Subject: [PATCH 1/3] Demote exit transition timeout error to warning --- Framework/Core/src/DataProcessingDevice.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Framework/Core/src/DataProcessingDevice.cxx b/Framework/Core/src/DataProcessingDevice.cxx index d5a07a1ebfd52..d6b73bc7476f8 100644 --- a/Framework/Core/src/DataProcessingDevice.cxx +++ b/Framework/Core/src/DataProcessingDevice.cxx @@ -122,7 +122,7 @@ void on_transition_requested_expired(uv_timer_t* handle) auto* state = (DeviceState*)handle->data; state->loopReason |= DeviceState::TIMER_EXPIRED; O2_SIGNPOST_ID_FROM_POINTER(cid, device, handle); - O2_SIGNPOST_EVENT_EMIT_ERROR(device, cid, "callback", "Exit transition timer expired. Exiting."); + O2_SIGNPOST_EVENT_EMIT_WARN(device, cid, "callback", "Exit transition timer expired. Exiting."); state->transitionHandling = TransitionHandlingState::Expired; } From 2c591be73e3269bb35c76b134d505e1a47f8385f Mon Sep 17 00:00:00 2001 From: Ole Schmidt Date: Wed, 17 Apr 2024 13:07:42 +0200 Subject: [PATCH 2/3] Fix --- Framework/Foundation/include/Framework/Signpost.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Framework/Foundation/include/Framework/Signpost.h b/Framework/Foundation/include/Framework/Signpost.h index 9ea8aea1192a9..3eaf8c4eaaed1 100644 --- a/Framework/Foundation/include/Framework/Signpost.h +++ b/Framework/Foundation/include/Framework/Signpost.h @@ -522,7 +522,7 @@ void o2_debug_log_set_stacktrace(_o2_log_t* log, int stacktrace) } else if (O2_BUILTIN_UNLIKELY(private_o2_log_##log->stacktrace)) { \ _o2_signpost_event_emit(private_o2_log_##log, id, name, remove_engineering_type(format).data(), ##__VA_ARGS__); \ } \ - O2_RAW_LOG_RAW(warn, ##__VA_ARGS__); \ + O2_LOG_MACRO_RAW(warn, format, ##__VA_ARGS__); \ }) #define O2_SIGNPOST_START(log, id, name, format, ...) \ From d0e87d73fffabafc6e1a512ed71bc6f93e337a65 Mon Sep 17 00:00:00 2001 From: Ole Schmidt Date: Wed, 17 Apr 2024 13:11:03 +0200 Subject: [PATCH 3/3] Format --- Framework/Foundation/include/Framework/Signpost.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Framework/Foundation/include/Framework/Signpost.h b/Framework/Foundation/include/Framework/Signpost.h index 3eaf8c4eaaed1..fc22147415792 100644 --- a/Framework/Foundation/include/Framework/Signpost.h +++ b/Framework/Foundation/include/Framework/Signpost.h @@ -522,7 +522,7 @@ void o2_debug_log_set_stacktrace(_o2_log_t* log, int stacktrace) } else if (O2_BUILTIN_UNLIKELY(private_o2_log_##log->stacktrace)) { \ _o2_signpost_event_emit(private_o2_log_##log, id, name, remove_engineering_type(format).data(), ##__VA_ARGS__); \ } \ - O2_LOG_MACRO_RAW(warn, format, ##__VA_ARGS__); \ + O2_LOG_MACRO_RAW(warn, format, ##__VA_ARGS__); \ }) #define O2_SIGNPOST_START(log, id, name, format, ...) \