Skip to content
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

React to appfwk configuration classes no longer being singletons but … #53

Merged
merged 8 commits into from
Jan 9, 2024
Merged

React to appfwk configuration classes no longer being singletons but … #53

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
e1e5d7f
React to appfwk configuration classes no longer being singletons but …
eflumerf Dec 7, 2023
3c92cc3
Remove DAQModuleManager
eflumerf Dec 11, 2023
d486d81
syncing ; previous commit: Author: Pengfei Ding <9438483+dingp@users.…
jcfreeman2 Dec 13, 2023
a09fef5
syncing ; previous commit: Author: John Freeman <[email protected]>
jcfreeman2 Dec 16, 2023
262c8ad
Use datatype_to_string in code to avoid confusion about what string t…
eflumerf Jan 5, 2024
c2f9f3f
syncing ; previous commit: Author: John Freeman <[email protected]>
jcfreeman2 Jan 8, 2024
9a4270d
syncing dunedaq-develop-cpp-ci.yml; previous commit: Author: John Fre…
jcfreeman2 Jan 9, 2024
d90c7c2
Merge branch 'develop' into eflumerf/NoOKSSingletons
eflumerf Jan 9, 2024
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
5 changes: 2 additions & 3 deletions plugins/ListReverser.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,11 +48,10 @@ ListReverser::ListReverser(const std::string& name)
}

void
ListReverser::init()
ListReverser::init(std::shared_ptr<appfwk::ModuleConfiguration> mcfg)
{
TLOG_DEBUG(TLVL_ENTER_EXIT_METHODS) << get_name() << ": Entering init() method";
auto mdal = appfwk::ModuleConfiguration::get()
->module<dal::ListReverser>(get_name());
auto mdal = mcfg->module<dal::ListReverser>(get_name());
for (auto con : mdal->get_inputs()) {
if (con->get_data_type() == "IntList") {
m_list_connection = con->UID();
Expand Down
2 changes: 1 addition & 1 deletion plugins/ListReverser.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ class ListReverser : public dunedaq::appfwk::DAQModule
ListReverser(ListReverser&&) = delete; ///< ListReverser is not move-constructible
ListReverser& operator=(ListReverser&&) = delete; ///< ListReverser is not move-assignable

void init() override;
void init(std::shared_ptr<appfwk::ModuleConfiguration> mcfg) override;
void get_info(opmonlib::InfoCollector& ci, int level) override;

private:
Expand Down
4 changes: 2 additions & 2 deletions plugins/RandomDataListGenerator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,10 @@ RandomDataListGenerator::RandomDataListGenerator(const std::string& name)
}

void
RandomDataListGenerator::init()
RandomDataListGenerator::init(std::shared_ptr<appfwk::ModuleConfiguration> mcfg)
{
TLOG_DEBUG(TLVL_ENTER_EXIT_METHODS) << get_name() << ": Entering init() method";
auto mdal = appfwk::ModuleConfiguration::get()
auto mdal = mcfg
->module<dal::RandomDataListGenerator>(get_name());
for (auto con : mdal->get_inputs()) {
if (con->get_data_type() == "CreateList") {
Expand Down
2 changes: 1 addition & 1 deletion plugins/RandomDataListGenerator.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ class RandomDataListGenerator : public dunedaq::appfwk::DAQModule
RandomDataListGenerator& operator=(RandomDataListGenerator&&) =
delete; ///< RandomDataListGenerator is not move-assignable

void init() override;
void init(std::shared_ptr<appfwk::ModuleConfiguration> mcfg) override;
void get_info(opmonlib::InfoCollector& ci, int level) override;

private:
Expand Down
4 changes: 2 additions & 2 deletions plugins/ReversedListValidator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,11 +48,11 @@ ReversedListValidator::ReversedListValidator(const std::string& name)
}

void
ReversedListValidator::init()
ReversedListValidator::init(std::shared_ptr<appfwk::ModuleConfiguration> mcfg)
{
TLOG_DEBUG(TLVL_ENTER_EXIT_METHODS) << get_name() << ": Entering init() method";

auto mdal = appfwk::ModuleConfiguration::get()
auto mdal = mcfg
->module<dal::ReversedListValidator>(get_name());
for (auto con : mdal->get_inputs()) {
if (con->get_data_type() == "ReversedList") {
Expand Down
2 changes: 1 addition & 1 deletion plugins/ReversedListValidator.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ class ReversedListValidator : public dunedaq::appfwk::DAQModule
ReversedListValidator(ReversedListValidator&&) = delete; ///< ReversedListValidator is not move-constructible
ReversedListValidator& operator=(ReversedListValidator&&) = delete; ///< ReversedListValidator is not move-assignable

void init() override;
void init(std::shared_ptr<appfwk::ModuleConfiguration> mcfg) override;
void get_info(opmonlib::InfoCollector& ci, int level) override;

private:
Expand Down