From 86f83e643013545692fe02d2f3f2ffc84d03d1be Mon Sep 17 00:00:00 2001 From: Deniz Tuana Ergonul Uzun Date: Thu, 2 Apr 2026 14:00:00 +0200 Subject: [PATCH] Delayed postprocessing attribute name changes --- .../snbmodules/readout/SNBDataHandlingModel.hpp | 10 +++++----- .../readout/detail/SNBDataHandlingModel.hxx | 14 +++++++------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/include/snbmodules/readout/SNBDataHandlingModel.hpp b/include/snbmodules/readout/SNBDataHandlingModel.hpp index 55b4c20..d0e2617 100644 --- a/include/snbmodules/readout/SNBDataHandlingModel.hpp +++ b/include/snbmodules/readout/SNBDataHandlingModel.hpp @@ -169,8 +169,8 @@ class SNBDataHandlingModel : public datahandlinglibs::DataHandlingConcept daqdataformats::SourceID m_sourceid; daqdataformats::run_number_t m_run_number; uint64_t m_processing_delay_ticks; - uint64_t m_post_processing_delay_min_wait; - uint64_t m_post_processing_delay_max_wait; + uint64_t m_post_processing_delay_min_wait_ms; + uint64_t m_post_processing_delay_max_wait_ms; // STATS using metric_t = dunedaq::datahandlinglibs::opmon::DataHandlerInfo; @@ -182,8 +182,8 @@ class SNBDataHandlingModel : public datahandlinglibs::DataHandlingConcept std::remove_const::type>::type; using num_lb_insert_failures_t = std::remove_const::type>::type; - using num_post_processing_delay_max_waits_t = std::remove_const< - std::invoke_result::type>::type; + using num_postprocess_schedule_timeouts_t = std::remove_const< + std::invoke_result::type>::type; std::atomic m_num_payloads{ 0 }; std::atomic m_sum_payloads{ 0 }; @@ -191,7 +191,7 @@ class SNBDataHandlingModel : public datahandlinglibs::DataHandlingConcept std::atomic m_sum_requests{ 0 }; std::atomic m_rawq_timeout_count{ 0 }; std::atomic m_num_lb_insert_failures{ 0 }; - std::atomic m_num_post_processing_delay_max_waits{ 0 }; + std::atomic m_num_postprocess_schedule_timeouts{ 0 }; std::atomic m_stats_packet_count{ 0 }; // CONSUMER diff --git a/include/snbmodules/readout/detail/SNBDataHandlingModel.hxx b/include/snbmodules/readout/detail/SNBDataHandlingModel.hxx index 585ce7e..72e6405 100644 --- a/include/snbmodules/readout/detail/SNBDataHandlingModel.hxx +++ b/include/snbmodules/readout/detail/SNBDataHandlingModel.hxx @@ -52,8 +52,8 @@ SNBDataHandlingModel::init(const appmodel::DataHandlerM m_sourceid.id = mcfg->get_source_id(); m_sourceid.subsystem = RDT::subsystem; m_processing_delay_ticks = mcfg->get_module_configuration()->get_post_processing_delay_ticks(); - m_post_processing_delay_min_wait = mcfg->get_module_configuration()->get_post_processing_delay_min_wait(); - m_post_processing_delay_max_wait = mcfg->get_module_configuration()->get_post_processing_delay_max_wait(); + m_post_processing_delay_min_wait_ms = mcfg->get_module_configuration()->get_post_processing_delay_min_wait_ms(); + m_post_processing_delay_max_wait_ms = mcfg->get_module_configuration()->get_post_processing_delay_max_wait_ms(); // Configure implementations: m_raw_processor_impl->conf(mcfg); @@ -102,7 +102,7 @@ SNBDataHandlingModel::start(const appfwk::DAQModule::Co m_num_lb_insert_failures = 0; m_stats_packet_count = 0; m_rawq_timeout_count = 0; - m_num_post_processing_delay_max_waits = 0; + m_num_postprocess_schedule_timeouts = 0; m_t0 = std::chrono::high_resolution_clock::now(); @@ -176,7 +176,7 @@ SNBDataHandlingModel::generate_opmon_data() ri.set_num_lb_insert_failures(local_num_lb_insert_failures); ri.set_sum_requests(m_sum_requests.load()); ri.set_num_requests(m_num_requests.exchange(0)); - ri.set_num_post_processing_delay_max_waits(m_num_post_processing_delay_max_waits.exchange(0)); + ri.set_num_postprocess_schedule_timeouts(m_num_postprocess_schedule_timeouts.exchange(0)); ri.set_last_daq_timestamp(m_raw_processor_impl->get_last_daq_time()); ri.set_newest_timestamp(m_raw_processor_impl->get_last_daq_time()); ri.set_oldest_timestamp(m_request_handler_impl->get_oldest_time()); @@ -270,10 +270,10 @@ SNBDataHandlingModel::postprocess_schedule() while (m_run_marker.load()) { try { co_await folly::coro::timeout( - m_baton.operator co_await(), std::chrono::milliseconds{ m_post_processing_delay_max_wait }, m_timekeeper.get()); + m_baton.operator co_await(), std::chrono::milliseconds{ m_post_processing_delay_max_wait_ms }, m_timekeeper.get()); m_baton.reset(); } catch (const folly::FutureTimeout&) { - ++m_num_post_processing_delay_max_waits; + ++m_num_postprocess_schedule_timeouts; } if (m_latency_buffer_impl->occupancy() == 0) { @@ -283,7 +283,7 @@ SNBDataHandlingModel::postprocess_schedule() now = std::chrono::system_clock::now(); milliseconds = std::chrono::duration_cast(now - last_post_proc_time); - if (static_cast(milliseconds.count()) <= m_post_processing_delay_min_wait) { + if (static_cast(milliseconds.count()) <= m_post_processing_delay_min_wait_ms) { continue; }