Skip to content

FakeDataProd: Use TimestampEstimatorSystem instead of nanosecond timestamps #469

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
eflumerf wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

FakeDataProd: Use TimestampEstimatorSystem instead of nanosecond timestamps #469

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions plugins/FakeDataProdModule.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@

#include "appmodel/FakeDataProdModule.hpp"
#include "confmodel/Connection.hpp"
#include "confmodel/DetectorConfig.hpp"
#include "dfmessages/Fragment_serialization.hpp"
#include "dfmessages/TimeSync.hpp"
#include "iomanager/IOManager.hpp"
Expand Down Expand Up @@ -54,6 +55,10 @@ void
FakeDataProdModule::init(std::shared_ptr<appfwk::ConfigurationManager> mcfg)
{
TLOG_DEBUG(TLVL_ENTER_EXIT_METHODS) << get_name() << ": Entering init() method";

auto clock_speed_hz = mcfg->get_session()->get_detector_configuration()->get_clock_speed_hz();
m_timestamp_estimator = std::make_unique<utilities::TimestampEstimatorSystem>(clock_speed_hz);

auto mdal = mcfg->get_dal<appmodel::FakeDataProdModule>(get_name());
if (!mdal) {
throw appfwk::CommandFailed(ERS_HERE, "init", get_name(), "Unable to retrieve configuration object");
Expand Down Expand Up @@ -132,17 +137,16 @@ FakeDataProdModule::do_stop(const CommandData_t& /*args*/)
void
FakeDataProdModule::do_timesync(std::atomic<bool>& running_flag)
{

while (m_timestamp_estimator == nullptr) {
std::this_thread::sleep_for(std::chrono::milliseconds(100));
}
auto iom = iomanager::IOManager::get();
auto sender_ptr = iom->get_sender<dfmessages::TimeSync>(m_timesync_id);

int sent_count = 0;
uint64_t msg_seqno = 0; // NOLINT (build/unsigned)
while (running_flag.load()) {
auto time_now = std::chrono::system_clock::now().time_since_epoch();
uint64_t current_timestamp = // NOLINT (build/unsigned)
std::chrono::duration_cast<std::chrono::nanoseconds>(time_now).count();
auto timesyncmsg = dfmessages::TimeSync(current_timestamp);
auto timesyncmsg = dfmessages::TimeSync(m_timestamp_estimator->get_timestamp_estimate());
++msg_seqno;
timesyncmsg.run_number = m_run_number;
timesyncmsg.sequence_number = msg_seqno;
Expand Down
6 changes: 4 additions & 2 deletions plugins/FakeDataProdModule.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,11 @@
#include "daqdataformats/Fragment.hpp"
#include "dfmessages/DataRequest.hpp"

#include "appmodel/FakeDataProdConf.hpp"
#include "appfwk/DAQModule.hpp"
#include "utilities/WorkerThread.hpp"
#include "appmodel/FakeDataProdConf.hpp"
#include "logging/Logging.hpp" // NOTE: if ISSUES ARE DECLARED BEFORE include logging/Logging.hpp, TLOG_DEBUG<<issue wont work.
#include "utilities/TimestampEstimatorSystem.hpp"
#include "utilities/WorkerThread.hpp"

#include <memory>
#include <string>
Expand Down Expand Up @@ -78,6 +79,7 @@ class FakeDataProdModule : public dunedaq::appfwk::DAQModule

// Configuration
const appmodel::FakeDataProdConf* m_fake_data_prod_conf;
std::unique_ptr<utilities::TimestampEstimatorSystem> m_timestamp_estimator;
// size_t m_sleep_msec_while_running;
std::chrono::milliseconds m_queue_timeout;
dunedaq::daqdataformats::run_number_t m_run_number;
Expand Down