Skip to content

Defer any access to DAL until conf transition. Just take a copy of th… #126

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

Draft
gcrone wants to merge 1 commit into
base: develop
Choose a base branch
from
Draft

Defer any access to DAL until conf transition. Just take a copy of th… #126

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: 12 additions & 2 deletions plugins/ListReverser.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ namespace dunedaq::listrev {
ListReverser::ListReverser(const std::string& name)
: DAQModule(name)
{
register_command("conf", &ListReverser::do_conf);
register_command("start", &ListReverser::do_start);
register_command("stop", &ListReverser::do_stop);
}
Expand All @@ -51,7 +52,16 @@ void
ListReverser::init(std::shared_ptr<appfwk::ConfigurationManager> mcfg)
{
TLOG_DEBUG(TLVL_ENTER_EXIT_METHODS) << get_name() << ": Entering init() method";
auto mdal = mcfg->get_dal<dal::ListReverser>(get_name());
m_cfg_mgr = mcfg;
TLOG_DEBUG(TLVL_ENTER_EXIT_METHODS) << get_name() << ": Exiting init() method";
}

void
ListReverser::do_conf(const CommandData_t& /*startobj*/)
{
TLOG_DEBUG(TLVL_ENTER_EXIT_METHODS) << get_name() << ": Entering do_conf() method";

auto mdal = m_cfg_mgr->get_dal<dal::ListReverser>(get_name());
for (auto con : mdal->get_inputs()) {
if (con->get_data_type() == datatype_to_string<IntList>()) {
m_list_connection = con->UID();
Expand Down Expand Up @@ -87,7 +97,7 @@ ListReverser::init(std::shared_ptr<appfwk::ConfigurationManager> mcfg)
<< mdal->get_request_timeout_ms() << "ms, " << " and " << m_generator_connections.size()
<< " generators.";

TLOG_DEBUG(TLVL_ENTER_EXIT_METHODS) << get_name() << ": Exiting init() method";
TLOG_DEBUG(TLVL_ENTER_EXIT_METHODS) << get_name() << ": Exiting conf() method";
}

void
Expand Down
5 changes: 4 additions & 1 deletion plugins/ListReverser.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ class ListReverser : public dunedaq::appfwk::DAQModule

private:
// Commands
void do_conf(const CommandData_t& obj);
void do_start(const CommandData_t& obj);
void do_stop(const CommandData_t& obj);

Expand Down Expand Up @@ -84,10 +85,12 @@ class ListReverser : public dunedaq::appfwk::DAQModule
mutable std::mutex m_map_mutex;

// Init
std::shared_ptr<appfwk::ConfigurationManager> m_cfg_mgr;

// Configuration
std::string m_requests;
std::string m_list_connection;

// Configuration
std::chrono::milliseconds m_send_timeout{ 100 };
std::chrono::milliseconds m_request_timeout{ 1000 };
size_t m_reverser_id{ 0 };
Expand Down
45 changes: 24 additions & 21 deletions plugins/RandomDataListGenerator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,30 @@ void
RandomDataListGenerator::init(std::shared_ptr<appfwk::ConfigurationManager> mcfg)
{
TLOG_DEBUG(TLVL_ENTER_EXIT_METHODS) << get_name() << ": Entering init() method";
auto mdal = mcfg->get_dal<dal::RandomDataListGenerator>(get_name());

m_cfg_mgr = mcfg;
TLOG_DEBUG(TLVL_ENTER_EXIT_METHODS) << get_name() << ": Exiting init() method";
}

void
RandomDataListGenerator::generate_opmon_data()
{
opmon::RandomListGeneratorInfo fcr;

fcr.set_generated_numbers(m_generated_tot.load());
fcr.set_new_generated_numbers(m_generated.exchange(0));
fcr.set_lists_sent(m_sent_tot.load());
fcr.set_new_lists_sent(m_sent.exchange(0));

publish(std::move(fcr));
}

void
RandomDataListGenerator::do_conf(const CommandData_t& /*args*/)
{
TLOG_DEBUG(TLVL_ENTER_EXIT_METHODS) << get_name() << ": Entering do_conf() method";

auto mdal = m_cfg_mgr->get_dal<dal::RandomDataListGenerator>(get_name());

if (mdal == nullptr) {
throw appfwk::CommandFailed(ERS_HERE, get_name(), "init", "Unable to load module configuration");
Expand All @@ -78,28 +101,8 @@ RandomDataListGenerator::init(std::shared_ptr<appfwk::ConfigurationManager> mcfg
m_list_mode =
static_cast<ListMode>(m_generator_id % (static_cast<uint16_t>(ListMode::MAX) + 1)); // NOLINT(build/unsigned)

TLOG_DEBUG(TLVL_ENTER_EXIT_METHODS) << get_name() << ": Exiting init() method";
}

void
RandomDataListGenerator::generate_opmon_data()
{
opmon::RandomListGeneratorInfo fcr;

fcr.set_generated_numbers(m_generated_tot.load());
fcr.set_new_generated_numbers(m_generated.exchange(0));
fcr.set_lists_sent(m_sent_tot.load());
fcr.set_new_lists_sent(m_sent.exchange(0));

publish(std::move(fcr));
}

void
RandomDataListGenerator::do_conf(const CommandData_t& /*args*/)
{
TLOG_DEBUG(TLVL_ENTER_EXIT_METHODS) << get_name() << ": Entering do_conf() method";

auto iom = iomanager::IOManager::get();
// Add this callback early as this is a pub/sub connection
iom->add_callback<CreateList>(m_create_connection,
get_name(),
Expand Down
3 changes: 3 additions & 0 deletions plugins/RandomDataListGenerator.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,9 @@ class RandomDataListGenerator : public dunedaq::appfwk::DAQModule
void process_request_list(const RequestList& request_list);

// Init
std::shared_ptr<appfwk::ConfigurationManager> m_cfg_mgr;


std::string m_request_connection;
std::string m_create_connection;

Expand Down
21 changes: 18 additions & 3 deletions plugins/ReversedListValidator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ ReversedListValidator::ReversedListValidator(const std::string& name)
: DAQModule(name)
, m_work_thread(std::bind(&ReversedListValidator::do_work, this, std::placeholders::_1))
{
register_command("conf", &ReversedListValidator::do_conf);
register_command("start", &ReversedListValidator::do_start);
register_command("stop", &ReversedListValidator::do_stop);
}
Expand All @@ -53,7 +54,18 @@ ReversedListValidator::init(std::shared_ptr<appfwk::ConfigurationManager> mcfg)
{
TLOG_DEBUG(TLVL_ENTER_EXIT_METHODS) << get_name() << ": Entering init() method";

auto mdal = mcfg->get_dal<dal::ReversedListValidator>(get_name());
m_cfg_mgr = mcfg;

TLOG_DEBUG(TLVL_ENTER_EXIT_METHODS) << get_name() << ": Exiting init() method";
}


void
ReversedListValidator::do_conf(const CommandData_t& /*args*/)
{
TLOG_DEBUG(TLVL_ENTER_EXIT_METHODS) << get_name() << ": Entering do_conf() method";

auto mdal = m_cfg_mgr->get_dal<dal::ReversedListValidator>(get_name());
for (auto con : mdal->get_inputs()) {
if (con->get_data_type() == datatype_to_string<ReversedList>()) {
m_list_connection = con->UID();
Expand Down Expand Up @@ -84,12 +96,15 @@ ReversedListValidator::init(std::shared_ptr<appfwk::ConfigurationManager> mcfg)
m_request_timeout = std::chrono::milliseconds(mdal->get_request_timeout_ms());
m_max_outstanding_requests = mdal->get_max_outstanding_requests();

m_request_rate_hz = mdal->get_request_rate_hz();

m_list_creator =
ListCreator(m_create_connection, m_send_timeout, mdal->get_min_list_size(), mdal->get_max_list_size());

TLOG_DEBUG(TLVL_ENTER_EXIT_METHODS) << get_name() << ": Exiting init() method";
TLOG() << get_name() << " successfully configured";
TLOG_DEBUG(TLVL_ENTER_EXIT_METHODS) << get_name() << ": Exiting do_conf() method";
}


void
ReversedListValidator::generate_opmon_data()
{
Expand Down
6 changes: 4 additions & 2 deletions plugins/ReversedListValidator.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ class ReversedListValidator : public dunedaq::appfwk::DAQModule

private:
// Commands
void do_conf(const CommandData_t& obj);
void do_start(const CommandData_t& obj);
void do_stop(const CommandData_t& obj);

Expand Down Expand Up @@ -93,10 +94,11 @@ class ReversedListValidator : public dunedaq::appfwk::DAQModule
ListCreator m_list_creator;

// Init
std::string m_list_connection;
std::string m_create_connection;
std::shared_ptr<appfwk::ConfigurationManager> m_cfg_mgr;

// Configuration
std::string m_list_connection;
std::string m_create_connection;
std::chrono::milliseconds m_send_timeout{ 100 };
std::chrono::milliseconds m_request_timeout{ 1000 };
size_t m_max_outstanding_requests{ 100 };
Expand Down
Loading