Merge pull request #128 from DUNE-DAQ/johnfreeman/daq-release_issue37…

…3_rename_oks_packages

JCF: perform renames as described in DUNE-DAQ/daq-release#373

plugins/NICReceiver.cpp

@@ -10,14 +10,14 @@
 #include "appfwk/ConfigurationManager.hpp"
 #include "appfwk/ModuleConfiguration.hpp"
 
-#include "appdal/DataReader.hpp"
-#include "coredal/ReadoutInterface.hpp"
-#include "appdal/NICReceiverConf.hpp"
-#include "appdal/NICInterface.hpp"
-#include "appdal/NICInterfaceConfiguration.hpp"
-#include "appdal/NICStatsConf.hpp"
-#include "appdal/EthStreamParameters.hpp"
-#include "coredal/QueueWithId.hpp"
+#include "appmodel/DataReader.hpp"
+#include "confmodel/ReadoutInterface.hpp"
+#include "appmodel/NICReceiverConf.hpp"
+#include "appmodel/NICInterface.hpp"
+#include "appmodel/NICInterfaceConfiguration.hpp"
+#include "appmodel/NICStatsConf.hpp"
+#include "appmodel/EthStreamParameters.hpp"
+#include "confmodel/QueueWithId.hpp"
 
 #include "logging/Logging.hpp"
 
@@ -93,7 +93,7 @@ tokenize(std::string const& str, const char delim, std::vector<std::string>& out
 void
 NICReceiver::init(const std::shared_ptr<appfwk::ModuleConfiguration> mcfg )
 {
- auto mdal = mcfg->module<appdal::DataReader>(get_name());
+ auto mdal = mcfg->module<appmodel::DataReader>(get_name());
  m_cfg = mcfg;
  if (mdal->get_outputs().empty()) {
 	auto err = dunedaq::readoutlibs::InitializationError(ERS_HERE, "No outputs defined for NIC reader in configuration.");
@@ -102,7 +102,7 @@ NICReceiver::init(const std::shared_ptr<appfwk::ModuleConfiguration> mcfg )
  }
 
  for (auto con : mdal->get_outputs()) {
-  auto queue = con->cast<coredal::QueueWithId>();
+  auto queue = con->cast<confmodel::QueueWithId>();
   if(queue == nullptr) {
 	  auto err = dunedaq::readoutlibs::InitializationError(ERS_HERE, "Outputs are not of type QueueWithGeoId.");
 	  ers::fatal(err);
@@ -131,8 +131,8 @@ NICReceiver::do_configure(const data_t& /*args*/)
 {
   TLOG() << get_name() << ": Entering do_conf() method";
   //auto session = appfwk::ModuleManager::get()->session();
-  auto mdal = m_cfg->module<appdal::DataReader>(get_name());
-  auto module_conf = mdal->get_configuration()->cast<appdal::NICReceiverConf>();
+  auto mdal = m_cfg->module<appmodel::DataReader>(get_name());
+  auto module_conf = mdal->get_configuration()->cast<appmodel::NICReceiverConf>();
   auto res_set = mdal->get_interfaces();
   // EAL setup
   TLOG() << "Setting up EAL with params from config.";
@@ -143,7 +143,7 @@ NICReceiver::do_configure(const data_t& /*args*/)
   std::string first_pcie_addr;
   bool is_first_pcie_addr = true;
   for (auto res : res_set) {
-    auto interface = res->cast<appdal::NICInterface>();
+    auto interface = res->cast<appmodel::NICInterface>();
     if (interface == nullptr) {
       dunedaq::readoutlibs::GenericConfigurationError err(
           ERS_HERE, "NICReceiver configuration failed due expected but unavailable interface!");
@@ -182,7 +182,7 @@ NICReceiver::do_configure(const data_t& /*args*/)
   }
 
   for (auto res : res_set) {
-    auto interface = res->cast<appdal::NICInterface>();
+    auto interface = res->cast<appmodel::NICInterface>();
     if (interface == nullptr) {
       dunedaq::readoutlibs::GenericConfigurationError err(
           ERS_HERE, "NICReceiver configuration failed due expected but unavailable interface!");

src/IfaceWrapper.cpp

@@ -22,13 +22,13 @@
 #include "IfaceWrapper.hpp"
 
 #include "appfwk/ConfigurationManager.hpp"
-#include "coredal/DROStreamConf.hpp"
-#include "coredal/StreamParameters.hpp"
-#include "coredal/GeoId.hpp"
-#include "appdal/NICInterface.hpp"
-#include "appdal/NICInterfaceConfiguration.hpp"
-#include "appdal/NICStatsConf.hpp"
-#include "appdal/EthStreamParameters.hpp"
+#include "confmodel/DROStreamConf.hpp"
+#include "confmodel/StreamParameters.hpp"
+#include "confmodel/GeoId.hpp"
+#include "appmodel/NICInterface.hpp"
+#include "appmodel/NICInterfaceConfiguration.hpp"
+#include "appmodel/NICStatsConf.hpp"
+#include "appmodel/EthStreamParameters.hpp"
 
 #include <chrono>
 #include <memory>
@@ -47,7 +47,7 @@ enum
 namespace dunedaq {
 namespace dpdklibs {
 
-IfaceWrapper::IfaceWrapper(const appdal::NICInterface *iface_cfg, source_to_sink_map_t& sources, std::atomic<bool>& run_marker)
+IfaceWrapper::IfaceWrapper(const appmodel::NICInterface *iface_cfg, source_to_sink_map_t& sources, std::atomic<bool>& run_marker)
     : m_sources(sources)
     , m_run_marker(run_marker)
 { 
@@ -83,7 +83,7 @@ IfaceWrapper::IfaceWrapper(const appdal::NICInterface *iface_cfg, source_to_sink
   auto res_set = iface_cfg->get_contains();
   for (const auto res : res_set) {
 
-    auto stream = res->cast<coredal::DROStreamConf>();
+    auto stream = res->cast<confmodel::DROStreamConf>();
     if (stream == nullptr) {
       dunedaq::readoutlibs::GenericConfigurationError err(
         ERS_HERE, std::string("NICInterface contains resources other than DROStreamConf!"));
@@ -93,7 +93,7 @@ IfaceWrapper::IfaceWrapper(const appdal::NICInterface *iface_cfg, source_to_sink
       TLOG() << "Sink for source_id "<< stream->get_source_id() << " not initialized!";
 	    continue;
     }
-    auto stream_params = stream->get_stream_params()->cast<appdal::EthStreamParameters>();
+    auto stream_params = stream->get_stream_params()->cast<appmodel::EthStreamParameters>();
 
     auto src_ip = stream_params->get_tx_ip();
     auto rx_q = stream_params->get_rx_queue();

src/IfaceWrapper.hpp

@@ -10,7 +10,7 @@
 #define DPDKLIBS_SRC_IFACEWRAPPER_HPP_
 
 //#include "dpdklibs/nicreader/Structs.hpp"
-#include "appdal/NICInterface.hpp"
+#include "appmodel/NICInterface.hpp"
 
 #include "dpdklibs/nicreaderinfo/InfoNljs.hpp"
 
@@ -22,8 +22,8 @@
 #include "dpdklibs/XstatsHelper.hpp"
 #include "SourceConcept.hpp"
 
-#include <coredal/Session.hpp>
-#include <appdal/NICInterface.hpp>
+#include <confmodel/Session.hpp>
+#include <appmodel/NICInterface.hpp>
 
 #include <nlohmann/json.hpp>
 
@@ -45,7 +45,7 @@ class IfaceWrapper
   //using source_conf_t = dunedaq::dpdklibs::nicreader::Source;
   using source_to_sink_map_t = std::map<int, std::unique_ptr<SourceConcept>>;
 
-  IfaceWrapper(const appdal::NICInterface* interface, source_to_sink_map_t& sources, std::atomic<bool>& run_marker);
+  IfaceWrapper(const appmodel::NICInterface* interface, source_to_sink_map_t& sources, std::atomic<bool>& run_marker);
   ~IfaceWrapper(); 
 
   IfaceWrapper(const IfaceWrapper&) = delete;            ///< IfaceWrapper is not copy-constructible