Skip to content

Commit 91f0e35

Browse files
authored
Merge pull request #402 from DUNE-DAQ/eflumerf/FixTriggerRecordBuilderDataTest
Set completion time in metadata function passed to complete_assignment, to minimize measurement error
2 parents 2f1edd9 + 80048ce commit 91f0e35

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

src/TriggerRecordBuilderData.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ TriggerRecordBuilderData::complete_assignment(daqdataformats::trigger_number_t t
105105

106106
++m_complete_counter;
107107
auto completion_time =
108-
std::chrono::duration_cast<std::chrono::microseconds>(std::chrono::steady_clock::now() - dec_ptr->assigned_time);
108+
std::chrono::duration_cast<std::chrono::microseconds>(now - dec_ptr->assigned_time);
109109
if (completion_time.count() < m_min_complete_time.load())
110110
m_min_complete_time.store(completion_time.count());
111111
if (completion_time.count() > m_max_complete_time.load())

unittest/TriggerRecordBuilderData_test.cxx

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,11 +104,13 @@ BOOST_AUTO_TEST_CASE(Assignments)
104104

105105
std::this_thread::sleep_for(std::chrono::milliseconds(50));
106106

107-
trbd_p->complete_assignment(1, [](nlohmann::json&) {});
107+
std::chrono::steady_clock::time_point complete_time;
108+
trbd_p->complete_assignment(1,
109+
[&complete_time](nlohmann::json&) { complete_time = std::chrono::steady_clock::now(); });
108110
BOOST_REQUIRE_EQUAL(trbd_p->used_slots(), 0);
109111

110112
auto latency =
111-
std::chrono::duration_cast<std::chrono::microseconds>(std::chrono::steady_clock::now() - assignment->assigned_time)
113+
std::chrono::duration_cast<std::chrono::microseconds>(complete_time - assignment->assigned_time)
112114
.count();
113115

114116
BOOST_REQUIRE_CLOSE(static_cast<double>(trbd_p->average_latency(start_time).count()), static_cast<double>(latency), 5);

0 commit comments

Comments
 (0)