From 65aaec80090042eab2fd41a1ac8f9fee115a3c38 Mon Sep 17 00:00:00 2001 From: Giulio Eulisse <10544+ktf@users.noreply.github.com> Date: Mon, 17 Feb 2025 10:36:24 +0100 Subject: [PATCH 1/2] DPL: drop messages explicitly Somehow if they remain in the queue the confuse the oldest possible timeframe mechanism. --- Framework/Core/src/DataRelayer.cxx | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/Framework/Core/src/DataRelayer.cxx b/Framework/Core/src/DataRelayer.cxx index c2ae459aace38..4f9fe39adf531 100644 --- a/Framework/Core/src/DataRelayer.cxx +++ b/Framework/Core/src/DataRelayer.cxx @@ -17,6 +17,7 @@ #include "Framework/DataDescriptorMatcher.h" #include "Framework/DataSpecUtils.h" #include "Framework/DataProcessingHeader.h" +#include "Framework/DataProcessingContext.h" #include "Framework/DataRef.h" #include "Framework/InputRecord.h" #include "Framework/InputSpan.h" @@ -46,7 +47,6 @@ #include #include #include -#include #include using namespace o2::framework::data_matcher; @@ -55,6 +55,8 @@ using DataProcessingHeader = o2::framework::DataProcessingHeader; using Verbosity = o2::monitoring::Verbosity; O2_DECLARE_DYNAMIC_LOG(data_relayer); +// Stream which keeps track of the calibration lifetime logic +O2_DECLARE_DYNAMIC_LOG(calibration); namespace o2::framework { @@ -480,6 +482,13 @@ DataRelayer::RelayChoice // We are in calibration mode and the data does not have the calibration bit set. // We do not store it. if (services.get().allowedProcessing == DeviceState::ProcessingType::CalibrationOnly && !isCalibrationData(messages[mi])) { + O2_SIGNPOST_ID_FROM_POINTER(cid, calibration, &services.get()); + O2_SIGNPOST_EVENT_EMIT(calibration, cid, "calibration", + "Dropping incoming %zu messages because they are data processing.", nPayloads); + // Actually dropping messages. + for (size_t i = mi ; i < mi + nPayloads + 1; i++) { + auto discard = std::move(messages[i]); + } mi += nPayloads; continue; } From 6d0a2d2b7cdae301c50b9ee92fd0039dc511f925 Mon Sep 17 00:00:00 2001 From: ALICE Action Bot Date: Mon, 17 Feb 2025 09:37:55 +0000 Subject: [PATCH 2/2] Please consider the following formatting changes --- Framework/Core/src/DataRelayer.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Framework/Core/src/DataRelayer.cxx b/Framework/Core/src/DataRelayer.cxx index 4f9fe39adf531..385d9a6c50c4a 100644 --- a/Framework/Core/src/DataRelayer.cxx +++ b/Framework/Core/src/DataRelayer.cxx @@ -486,7 +486,7 @@ DataRelayer::RelayChoice O2_SIGNPOST_EVENT_EMIT(calibration, cid, "calibration", "Dropping incoming %zu messages because they are data processing.", nPayloads); // Actually dropping messages. - for (size_t i = mi ; i < mi + nPayloads + 1; i++) { + for (size_t i = mi; i < mi + nPayloads + 1; i++) { auto discard = std::move(messages[i]); } mi += nPayloads;